Replay Importing / Spinner #99
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
April 2, 2015 19:10
Improves Score accuracy (still mostly wrong) inital replay seek
Conflicts: src/itdelatrisu/opsu/GameData.java src/itdelatrisu/opsu/Options.java src/itdelatrisu/opsu/OsuFile.java src/itdelatrisu/opsu/OsuGroupList.java src/itdelatrisu/opsu/OsuHitObject.java src/itdelatrisu/opsu/OsuParser.java src/itdelatrisu/opsu/UI.java src/itdelatrisu/opsu/db/OsuDB.java src/itdelatrisu/opsu/objects/Circle.java src/itdelatrisu/opsu/objects/HitObject.java src/itdelatrisu/opsu/objects/Slider.java src/itdelatrisu/opsu/objects/Spinner.java src/itdelatrisu/opsu/states/Game.java src/itdelatrisu/opsu/states/Splash.java
Clean up
Conflicts: src/itdelatrisu/opsu/GameData.java src/itdelatrisu/opsu/states/Game.java
| @@ -296,10 +296,6 @@ public HitObjectResult(int time, int result, float x, float y, Color color, | |||
| /** The difficulty multiplier used in the score formula. */ | |||
| private int difficultyMultiplier = 2; | |||
|
|
|||
| /** Beatmap HPDrainRate value. (0:easy ~ 10:hard) */ | |||
| @SuppressWarnings("unused") | |||
| private float drainRate = 5f; | |||
There was a problem hiding this comment.
This is going to be used in the health formula eventually, so please leave it there!
Single file read md5 pitch change synctime
|
Sorry it took so long to merge this. Thanks again! I'll try to come up with a better UI for the replay seeking, but I can't think of anything at the moment. x.x |
itdelatrisu
added a commit
that referenced
this pull request
Jun 30, 2015
- Many code style changes. - Don't increment combo if missing the last slider circle. - Added player name in ranking screen. - Don't show null/default player names. - Only import replays with .osr extension. - Display loading status for importing replays. - Moved MD5InputStreamWrapper to package "opsu.io". Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
itdelatrisu
added a commit
that referenced
this pull request
Jul 3, 2015
- Added on/off option for replay seeking in the "custom" menu. - Mute sounds while seeking. - Draw a bar on the left of the screen during replays for seeking (instead of just clicking near the top of the screen). Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Imports replays/.osr from the ReplayImport directory into opsu
Slightly improved score accuracy.
Improves Spinner and should fix? #67
but still probably wrong.
Poorly implemented replay seeking. Clicking near the top of the window seeks the position of the replay
where the left is the start and the right is the end.