Commit Graph
53 Commits
Author SHA1 Message Date
fd 038a5d5779 WIPTest Merge Fixes 2015-06-14 12:29:15 -04:00
fd fd3f7fdabe Merge remote-tracking branch 'org/master' into ReplayTest
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
2015-06-13 20:28:30 -04:00
fd 40e67cedc9 Spinner Test2
Improves Score accuracy
(still mostly wrong)

inital replay seek
2015-06-13 18:35:30 -04:00
fd 61d00627cf More curve types #76 fix? 2015-04-13 22:56:07 -04:00
fd e792c3cae6 Clean 2015-04-12 13:55:52 -04:00
fd 12e70002d6 More curve types
Catmull curves
Line Curves(half assed)
Curve refactor
#73 near 0 length sliders
2015-04-12 10:55:39 -04:00
fd fa9accfc88 spinner 2015-04-03 14:00:59 -04:00
fd a49b5bc945 Replay importing 2015-04-02 19:10:33 -04:00
fd f54ba9d3e8 Fix for #53 2015-03-19 22:55:42 -04:00
fd 2356d8df69 Hopefully fixes most of the bugs of the replay change.
append
2015-03-19 00:52:05 -04:00
fd f67ca79ea7 Hopefully fixes most of the bugs of the replay change. 2015-03-19 00:33:19 -04:00
fd 2877d9bc3d Merge remote-tracking branch 'org/master' into ReplayTest
Conflicts:
	src/itdelatrisu/opsu/objects/HitObject.java
	src/itdelatrisu/opsu/states/Game.java
2015-03-18 00:20:34 -04:00
fd 93b336fdf6 Fixes Flickering during replay
Calculates Md5 for beatmap files.

Reverse Slider ball #50
2015-03-17 23:39:18 -04:00
fd 60f2a9f142 ReplayTest
Seems to work
but still buggy
lots of flickering during replay
2015-03-15 14:31:26 -04:00
fd aeaaa9af4f @2x size images.
ComboBurst speed scaling.

CircumscribedCircle drawing optimization.
2015-03-14 18:50:09 -04:00
fd be4cb6d608 Merge remote-tracking branch 'ita/master' into omaster
Conflicts:
	src/itdelatrisu/opsu/GameImage.java
2015-03-12 22:51:14 -04:00
fd 0b16f0e157 More General scaling
Font Scaling.
Hit Error Bar scaling.
2015-03-12 22:49:04 -04:00
fd ab9ea57a4c Attempt to fix inaccurate track positions #42
cleanup
2015-03-10 22:55:58 -04:00
fd f27744ceaa Attempt to fix inaccurate track positions #42 2015-03-10 22:14:22 -04:00
fd 421cfad6ad Fixes some sliders with too much control points. 2015-03-07 20:54:16 -05:00
fd 64755bbc5c Attempts to load music with incorrect file names. #33 2015-03-07 19:46:56 -05:00
fd 11b5c41b46 Next track on trackEnded
(but checks trackended every update...)
Continue playing while minimized(does not fix moving)
start from preview time in songMenu on repeat
2015-03-07 15:31:21 -05:00
fd 75361e21e3 Spinner Changes
frame independent spin up/average
rpm for Auto/SpunOut
CCW rotation
fade in
addition
2015-03-07 13:03:21 -05:00
fd b13787527a Spinner Changes
frame independent spin up/average
rpm for Auto/SpunOut
CCW rotation
fade in
addition
2015-03-07 12:40:14 -05:00
fd f4969de438 Spinner Changes
frame independent spin up/average
rpm for Auto/SpunOut
CCW rotation
fade in
addition
2015-03-07 12:36:24 -05:00
fd d468a81c92 Attempt to fix jitter by using a higher precision timer. 2015-03-03 22:07:00 -05:00
fd f9f95aae11 Merge remote-tracking branch 'ita/master' into AudioTest
Conflicts:
	src/itdelatrisu/opsu/states/SongMenu.java
2015-03-01 13:14:44 -05:00
fd 04bfbc70fc Addition/Edge Addition SampleSet
Minor fix with combo colors and spinners
2015-03-01 11:06:46 -05:00
fd 955a184d2c Global max clips
reuse clips
close extraclips in ranking
2015-02-28 18:28:58 -05:00
fd 8512f7c3c5 Fixes loading mp3 multiclip since AudioInputStream.availble didn't work. 2015-02-27 19:32:14 -05:00
fd 8a8024aadb Nevermind 2015-02-27 00:38:47 -05:00
fd 9c2c5e309a Half fix for some sliders
which doesn't have enough distance in the curve to reach the end.
2015-02-27 00:04:58 -05:00
fd fbce0391a8 Allows multiple instance of the same clip to be played simultaneously.
This might fix some issues with some sounds not being played sometimes.

Also might require more memory since more clips are created.
2015-02-26 23:45:24 -05:00
fd 27f5454afb Fixes Music Ended (hopefully) 2015-02-21 20:20:57 -05:00
fd 2825f4c885 Fixes Music Ended (hopefully) 2015-02-21 20:14:48 -05:00
fd 678a2ad681 Mp3 wav through mp3spi
May have fixed loading some other unique audio.
2015-02-18 00:35:35 -05:00
fd 1dc71aaa7f Merge quick bad fix 2015-02-17 22:54:20 -05:00
fd 65e538fbdc Merge remote-tracking branch 'orgin/master' into omaster
Conflicts:
	src/itdelatrisu/opsu/GameImage.java
	src/itdelatrisu/opsu/OsuGroupNode.java
2015-02-17 22:49:19 -05:00
fd ffed4b260a Back and Skip animation
removed minimum time before skip button is shown.
2015-02-17 22:29:53 -05:00
fd 987a406123 Clean up2 2015-02-16 17:13:16 -05:00
fd c48008d2a3 Clean up 2015-02-16 17:05:01 -05:00
fd e02b195b71 Hard coded Ranking Panel
Hard coded Scorebar
Made MenuButtonBG colours darker
Extends ScoresData clock bg
More General Scaling
2015-02-16 11:34:35 -05:00
fd fff0080ddc Combo Color ordering
General Image scaling
Score fixed size width

Spinner centering (slick has bad centering)

Broke Ranking Panel
2015-02-15 18:51:07 -05:00
fd 5a2fbd82fa Removed Hit Error Bar during breaks
Keep Hit Error Ticks inside bar
Removed Miss Locations
2015-02-14 22:15:41 -05:00
fd 8c3604d4db Visual changes #2
Fill bg image to screen while keeping aspec ratio
Added a few more resolutions
2015-02-14 14:10:47 -05:00
fd 597c4bfb19 Visual Changes
mostly personal preferences though

Larger hit circles
Circle overlay after drawing circle
Fade in approach circles
Fade in sliders (I don't think it looks that bad)
Fade out hit lighting
Hit Error Bar
 Probably need an option for this.
Miss locations(I don't know)

Reverse Slider ball rotation on repeats
2015-02-14 13:45:14 -05:00
fd 3a5f66ba81 close mp3 file handles. 2015-02-13 23:17:33 -05:00
fd a0bf2293cf Clean up and it doesn't throw that slick exception anymore. 2015-02-11 22:41:20 -05:00
fd 08406ac038 Changed some methods in OpenALStreamPlayer to synchornized methods.
Seems to work with ogg now too.

Hopefully this fixes it, but I don't 
actually know much about concurrency.

However it stills throws "Could not clear SoundStore sources, err"
and so it remains removed.
2015-02-09 21:33:37 -05:00
fd 6883e2ab44 MP3 Audio Streaming through modifying some of slick's openal files
May rarly crash/not play on next music.
May have introduced other unknown bugs. 
This may be due to loading it async.
Also loading of ogg is not loaded async anymore as it seems it doesn't
work very well.
2015-02-08 23:48:55 -05:00
fd 0e9fd24754 Minor Fixes for beziers angles 2015-01-29 01:08:23 -05:00
fd 07f6ef9479 Comments for previous commit 2015-01-29 00:37:25 -05:00
fd 33f2207881 CircumscribedCircle, LinearBezier Curves, multi repeats arrows,
CircleColorOrdering

fd
2015-01-28 00:30:51 -05:00