Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,295 Commits 2 Branches 0 Tags 50 MiB
6c461fa645
Commit Graph

930 Commits

Author SHA1 Message Date
yugecin
fc32040b2f fix hitresult reversearrow color 2016-12-24 14:49:24 +01:00
yugecin
653d27d7b2 remove the end game timer 2016-12-24 14:43:53 +01:00
yugecin
20194d58b3 post merge stuff 2016-12-24 14:35:36 +01:00
yugecin
a6540044b6 Merge remote-tracking branch 'remotes/original/master' into upstream 
# Conflicts:
#	src/itdelatrisu/opsu/Container.java
#	src/itdelatrisu/opsu/GameData.java
#	src/itdelatrisu/opsu/Options.java
#	src/itdelatrisu/opsu/audio/MusicController.java
#	src/itdelatrisu/opsu/objects/Circle.java
#	src/itdelatrisu/opsu/objects/Slider.java
#	src/itdelatrisu/opsu/render/CurveRenderState.java
#	src/itdelatrisu/opsu/states/Game.java
#	src/itdelatrisu/opsu/states/MainMenu.java
#	src/itdelatrisu/opsu/states/SongMenu.java
#	src/itdelatrisu/opsu/ui/Colors.java
#	src/itdelatrisu/opsu/ui/MenuButton.java
 2016-12-24 14:35:20 +01:00
Jeffrey Han
aa1babed3b Delayed fade-out of UI after finishing a game. 
All elements quickly fade out, and wait 2.5s before switching screens (instead of immediately).

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-24 01:55:43 -05:00
Jeffrey Han
9f2aa7c1fb Star fountain motions. 
Star fountains now "randomly" spray upwards, inwards, or outwards.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-23 16:53:12 -05:00
Jeffrey Han
5704b8aa10 Added star fountains to main menu. 
- Added MusicController methods to get measure progress (similar to beat progress).
- Workaround for inaccurate track positions after looping by not looping.
- Make sure star duration is positive.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-23 04:03:32 -05:00
Jeffrey Han
106891a259 More star stream tweaks. 
- Pass in the max stars in the stream, excluding bursts. (Use 0 for burst-only star streams.)
- Added duration spread setters. (Scoreboard star stream burst now happens faster.)

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-23 01:29:49 -05:00
Jeffrey Han
2d7a4a3eab Fixed bug with watching replays on "Auto" counting as retries. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-23 00:50:45 -05:00
Jeffrey Han
8a7b67b578 Star stream updates. (mad-s/opsu@701ef796) 
- Make StarStream directional.
- Burst stars when score rank increases.
 2016-12-23 00:40:36 -05:00
Jeffrey Han
81c8a61bb8 Better-defined root directory. 
- If running from a JAR, the root directory will be the same directory as the JAR (not where it was launched).
- Otherwise, use the current working directory.
- XDG unaffected.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 19:54:05 -05:00
Jeffrey Han
25efbd3023 Fixed MenuButton expand directions. (blame: 474b407, #214) 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 19:16:34 -05:00
Jeffrey Han
1436f2376e New theme song. 
"Rainbows" by Kevin MacLeod.

Some config loading tweaks to make updating the theme song more seamless.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 18:36:31 -05:00
Jeffrey Han
e3276a3365 Color unplayed beatmaps pink in the menu. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 17:37:29 -05:00
Jeffrey Han
0d92d79ed7 Fix beatmap array fields not being loaded. (fixes #222, blame: #214) 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 14:37:23 -05:00
Jeffrey Han
ed06a8b0ac Added "favorites" and "last played" beatmap groups, and more sorts. 
- New sorts: by date added, and most played.
- Sorts are moved to a dropdown menu.
- Tabs are now groupings (all songs, last played, favorites).
- Add/remove "favorite" beatmaps in the right-click menu.
- Beatmap database is now updateable like score database (no longer drops/recreates on every update).
- Various bug fixes.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-22 05:26:09 -05:00
Jeffrey Han
4446487575 Fixed bug where disabling mouse buttons also blocks scrolling. (#220) 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-20 15:18:20 -05:00
Jeffrey Han
8b7b7e0354 Fixed error handling issues in the game container. (#218) 
This makes error catching generally more robust. Catch all exceptions in start() loop, catch close_sub() exceptions separately, and suppress linked errors (so the root exception should actually get captured).

Also fixed null pointers in methods called by close_sub().

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-20 12:08:41 -05:00
Jeffrey Han
59204665bc Fixed a potential NullPointerException in ScoreDB. (#219) 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-20 10:19:02 -05:00
Jeffrey Han
7fa9355bbf More efficient beat progress calculation. (#214) 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 22:39:49 -05:00
Jeffrey Han
90a2f1d2f2 Follow-up to #214: cleanup. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 21:02:01 -05:00
Jeffrey Han
0f936d32cb Merge pull request #214 from yugecin/pusing-logo 
Pulse main menu logo to the beat, add pulsing logo in song menu
 2016-12-19 19:17:26 -05:00
yugecin
22f6259092 fix hover scale 2016-12-20 00:51:38 +01:00
yugecin
156d52f8c8 cleanup 2016-12-20 00:40:51 +01:00
Jeffrey Han
4af2d7bfcf Minor "auto" mod fixes in the song menu. 
- Enable "auto" with ctrl+click (instead of just ctrl+enter).
- Always turn off "auto" after one game.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 18:33:06 -05:00
yugecin
82e2d2100d simplify expand scale calc 2016-12-20 00:32:14 +01:00
yugecin
e648a553ea make the footer logo a button, start game when clicking & expand on hover 2016-12-20 00:31:15 +01:00
Jeffrey Han
1b99795abd Draw hit objects on top of hit result animations. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 17:13:22 -05:00
Jeffrey Han
e161d0180e Follow-up to #211: fix slider hit results not appearing; code cleanup. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 16:33:20 -05:00
Jeffrey Han
d111fc0efe Merge pull request #211 from yugecin/slider-improvements 
Slider improvements (fade in ticks, fade out reversearrow, animations)
 2016-12-19 14:21:01 -05:00
Jeffrey Han
6bc6441985 Follow-up to #216. 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
 2016-12-19 14:17:41 -05:00
Matteo Signer
2aa1fd7b4e Fix OpenGL version requirement. 2016-12-19 17:42:21 +01:00
Matteo Signer
bae3b711cf Render end cap at all times. 2016-12-19 17:33:10 +01:00
yugecin
624296deea add a timingpoint for the themesong so the logo can be pulsed 2016-12-18 23:51:30 +01:00
yugecin
0ee16f2cb2 javadoc adjustment 2016-12-18 23:48:55 +01:00
yugecin
f47d54c4d0 added pulsing logo at the bottom right of the song menu 2016-12-18 23:45:33 +01:00
yugecin
f7e42c271f make the main menu logo pulse 2016-12-18 23:41:36 +01:00
yugecin
13e1fb5193 parse timingpoints of a map when playing the song, to allow logo pulsing 2016-12-18 23:40:58 +01:00
yugecin
ff68145ba3 added BeatmapParser#parseOnlyTimingPoints 2016-12-18 23:39:39 +01:00
yugecin
77c6dfd65a added MusicController#getBeatProgress 2016-12-18 23:31:17 +01:00
yugecin
474b40750e allow custom scale overrides on menubuttons 2016-12-18 23:29:49 +01:00
yugecin
caefbdee9b minor cleanup 2016-12-18 22:57:19 +01:00
yugecin
338e74b7d2 pulse mainmenu logo when nothing is playing (close #105) 2016-12-18 21:12:40 +01:00
yugecin
c974374d67 Add option to color main menu logo based on the cursor color (close #82) 2016-12-18 21:03:19 +01:00
yugecin
64a3a85eb0 ghost logo adjustments 2016-12-18 20:35:08 +01:00
yugecin
089ff7d0de minor cleanup 2016-12-18 16:47:55 +01:00
yugecin
3ca2653197 adjust the slider circles alpha when hidden mod is enabled 2016-12-18 16:41:52 +01:00
yugecin
b252f0ec42 use the same fade for reversearrows as circles 2016-12-18 16:37:48 +01:00
yugecin
5be3fdf1a3 fade in slider circles after repeats, hide them if ball does not need to go to them again 2016-12-18 16:18:51 +01:00
yugecin
2260299c4b don't show reversearrow pop when slider wasn't held 2016-12-18 15:06:21 +01:00
yugecin
55fa6f4070 fix initial circle animation position 2016-12-18 14:53:04 +01:00
yugecin
3c6b20f4c8 adjust the animations on the first circle of the slider 2016-12-18 14:46:02 +01:00
yugecin
59ed2f9ee3 don't draw animations when hidden is enabled 2016-12-18 13:08:36 +01:00
yugecin
62a7ee0f21 always fadeout slider curve 2016-12-18 13:03:09 +01:00
Jeffrey Han
db73fc9e14 Merge pull request #212 from mad-s/master 
Fix falling sliders with new slider style.
 2016-12-14 12:55:58 -05:00
Matteo Signer
2ade7fa349 Fix falling sliders with new slider style. 2016-12-14 15:31:41 +01:00
yugecin
cb09e2149c let sliders shrink one point more for more fluent shrinking 2016-12-13 15:45:18 +01:00
yugecin
d7d28a559b fix shrinking sliders on sliders with odd amount of repeats when using fallback rendering (close #108) 2016-12-13 15:44:33 +01:00
yugecin
d9669ddcd5 gracefully handle error when loading all beatmaps (close #110) 2016-12-13 15:22:23 +01:00
yugecin
18e1ef1fcd fix pippi radius not updating 2016-12-13 15:02:37 +01:00
yugecin
176de19745 nullcheck to fix #106 2016-12-13 00:01:01 +01:00
yugecin
33064b1e69 fix mirror reversearrow animation drawing when it shouldn't 2016-12-12 20:35:40 +01:00
yugecin
69cdecca69 Merge remote-tracking branch 'remotes/origin/master' 2016-12-12 19:54:20 +01:00
yugecin
c88035a66c disable chaning to polymover when changing from storyboard (close #102) 2016-12-12 19:48:03 +01:00
yugecin
1c5f66f149 Option to disable reverse arrow hit anim 2016-12-12 08:37:21 +01:00
yugecin
6f46092766 follow-up to 1bf9186: don't color the reversearrow black on bright combo color, add mirror reverseerror fade out 2016-12-12 08:33:57 +01:00
yugecin
3048b31ec7 follow-up to 1bf9186 2016-12-12 01:36:00 +01:00
yugecin
1bf9186685 Merge remote-tracking branch 'remotes/yugefork/slider-improvements' 
# Conflicts:
#	src/itdelatrisu/opsu/GameData.java
#	src/itdelatrisu/opsu/objects/Slider.java
 2016-12-12 01:35:33 +01:00
yugecin
0d9378edb0 remove an unused parameter 2016-12-12 01:23:12 +01:00
yugecin
50912cf72e remove an unused variable 2016-12-12 01:21:37 +01:00
yugecin
a3813075d7 fade in sliderticks after repeat 2016-12-12 01:21:05 +01:00
yugecin
83466c9ef5 fade out reversearrows after ball passed them 2016-12-12 01:05:32 +01:00
yugecin
497f41ec6b show initial slidercircle hit for non-auto player too 2016-12-12 00:36:26 +01:00
yugecin
4c6c0bd24c kickstart cursor differently so it doesnt draw a line 2016-12-12 00:24:03 +01:00
yugecin
c11d8b3053 Merge branch 'sb' 2016-12-12 00:16:16 +01:00
yugecin
a8a92bce5c fix wm 2016-12-12 00:16:05 +01:00
yugecin
baa43ac544 attempt to fix sb again 2016-12-11 20:15:08 +01:00
yugecin
86ebe2ef73 more sb fixes 2016-12-11 20:03:28 +01:00
yugecin
f446d29f36 fix!! changing obj color overrides in sb not working 2016-12-11 19:55:58 +01:00
yugecin
a22c232beb fix cursortrail when changing sb index 2016-12-11 19:25:35 +01:00
yugecin
dce918208b do cursortrail kickoff offscreen 2016-12-11 19:19:54 +01:00
yugecin
5af1facbbe don't save wm 2016-12-11 19:06:46 +01:00
yugecin
6660f127f9 attempt to fix stuff not updating 2016-12-11 16:32:21 +01:00
yugecin
98e9b5c210 fix sb speed once and for all 2016-12-11 14:52:54 +01:00
yugecin
7309399fd5 fix speed resetting when skipping objects using sb 2016-12-11 14:41:09 +01:00
yugecin
642baf1081 fix mirror curve for mergingsliders 2016-12-11 14:37:48 +01:00
yugecin
cfa27727db fix pippi radius option value range 2016-12-11 14:25:30 +01:00
yugecin
366eda0310 fix opsu not being able to start 2016-12-11 14:15:15 +01:00
yugecin
f06c285d22 change the position of the remove bg option 2016-12-11 14:07:23 +01:00
yugecin
f7ab8b2f01 kickstart the cursor trail for every state 2016-12-11 14:05:15 +01:00
yugecin
c1a07feee4 attempt to fix no cursortrail at start of slow maps (close #73) 2016-12-11 13:43:28 +01:00
yugecin
3675479f57 remove the 'unstable' from shrinking/merging sliders options 2016-12-11 13:39:40 +01:00
yugecin
814922e58a Merge branch 'options-redesign' 2016-12-11 13:34:28 +01:00
yugecin
00616abf47 fix some option units 2016-12-11 13:31:54 +01:00
yugecin
f0c51084d1 clean up options 2016-12-11 13:25:04 +01:00
yugecin
03ef993a18 let the parent draw UI, fix SBoverlay input events 2016-12-11 12:16:20 +01:00
yugecin
da65270ab0 use new option overlay for storyboard menu 2016-12-11 11:57:17 +01:00
yugecin
b177605cbb cleanup 2016-12-11 11:10:32 +01:00
yugecin
3c8b769248 make comboboxes work 2016-12-11 11:07:28 +01:00
yugecin
1bd5da6434 make sliders slide 2016-12-11 10:08:22 +01:00