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

1209 Commits

Author SHA1 Message Date
yugecin
02863de1cf add code to exit from code 2017-01-18 16:55:30 +01:00
yugecin
b1ccfe3019 fix skipping close functions on startup exception 2017-01-18 16:43:35 +01:00
yugecin
605dcec605 bubble notif when fullscreen is not supported + changed bubble colors 2017-01-18 11:59:30 +01:00
yugecin
57b29d7e91 getting rid of the temp displaymode 2017-01-18 10:27:40 +01:00
yugecin
4e5f69b9a0 converted mainmenu 2017-01-17 23:44:12 +01:00
yugecin
8b226f3afc working splash state 2017-01-17 23:18:12 +01:00
yugecin
5e09a1d24a attempt to correct the fps counter target values 2017-01-17 22:26:19 +01:00
yugecin
b270015c14 javadoc for non-obvious things 2017-01-17 22:02:40 +01:00
yugecin
14c8fba9cb colorful fps counters 2017-01-17 21:06:59 +01:00
yugecin
580b4142f6 don't pass deltas as param 2017-01-17 18:45:17 +01:00
yugecin
f0883ff1af draw the bar notification above the bubble notifications 2017-01-17 17:13:25 +01:00
yugecin
97e71e158d animation for the bar notifications 2017-01-17 17:08:05 +01:00
yugecin
3d5dacf70f add forgotten recalculations after changing resolution 2017-01-17 16:22:06 +01:00
yugecin
281d888905 fix bubble notif hitbox 2017-01-17 16:15:09 +01:00
yugecin
c6464ffb25 bubble notifications (close #111) 2017-01-17 16:11:59 +01:00
yugecin
18d579eb62 smallbold font and newlines when wrapping text (itdelatrisu/opsu@21aa72b) 2017-01-17 13:37:47 +01:00
yugecin
9da723c50b simple bar notifications 2017-01-17 11:25:36 +01:00
yugecin
3ba50ebe60 move demux into displaycontainer 2017-01-16 22:36:50 +01:00
yugecin
09dfc68f16 Moving even more stuff around 2017-01-16 21:53:48 +01:00
yugecin
2ed0254c34 removed guice dependency which was a spaceshuttle used to cross the road 2017-01-16 21:28:40 +01:00
yugecin
9d0ddc5fd0 created own, lightweight injector 2017-01-16 21:19:31 +01:00
yugecin
07d15eeb56 draw fps 2017-01-15 23:38:20 +01:00
yugecin
7c79deac65 Initialize fonts in GL setup phase 2017-01-15 23:36:21 +01:00
yugecin
7b1d052de7 use explicit init with state in demux and remove the mocked state 2017-01-15 22:54:42 +01:00
yugecin
54b1b3bb1c use EventBus instead of ResolutionChangeListener 2017-01-15 22:46:09 +01:00
yugecin
ec39392689 eventbus 2017-01-15 22:37:59 +01:00
yugecin
88676f2c36 also catch startup exceptions 2017-01-15 00:21:52 +01:00
yugecin
4f10577321 make the error handler a single instance and always dump the displaycontainer 2017-01-15 00:20:20 +01:00
yugecin
24c6c7da77 make more stuff ErrorDumpable 2017-01-15 00:11:52 +01:00
yugecin
c467e9b34e let the base state listen to the resolution change events 2017-01-14 23:49:10 +01:00
yugecin
a1e5c3d30f getting rid of delegation methods 2017-01-13 16:28:36 +01:00
yugecin
e4d4e93f0a added todo 2017-01-12 12:45:14 +01:00
yugecin
b56007347a more startup stuff 2017-01-12 12:45:08 +01:00
yugecin
7fee3aa005 remove exit code from errorhandler 2017-01-12 11:31:58 +01:00
yugecin
a647ea206d improve errorhandler result text 2017-01-11 23:20:03 +01:00
yugecin
cb8eab0023 truncate error body when posting github issue 2017-01-11 23:13:37 +01:00
yugecin
66ee2a0979 handle close request per state 2017-01-11 23:04:50 +01:00
yugecin
4ba32c44f2 typos 2017-01-11 23:02:17 +01:00
yugecin
e9120652a1 improve transition base 2017-01-11 23:02:12 +01:00
yugecin
cb92d45ae8 rename log method to sout 2017-01-11 20:46:10 +01:00
yugecin
68ac7f3d10 ErrorHandler 2017-01-11 20:41:13 +01:00
yugecin
90684c084a fix incorrect calling of update method 2017-01-10 14:11:15 +01:00
yugecin
1248d0a29f disable controllers 2017-01-10 13:16:57 +01:00
yugecin
7162f8bc7d handle input at higher rate than render rate 2017-01-10 13:02:40 +01:00
yugecin
6857393315 input events 2017-01-10 12:43:05 +01:00
yugecin
e05b675285 moving stuff around again 2017-01-10 12:07:24 +01:00
yugecin
0ceff03bdd log start time 2017-01-09 23:10:51 +01:00
yugecin
9c0eaca4ee moving stuff around 2017-01-09 22:45:52 +01:00
yugecin
e8cac712fc getting rid of the slick (App)GameContainer 2017-01-09 22:42:59 +01:00
yugecin
d5796e5a1e cleanup the prestartupinitializer 2017-01-08 11:23:23 +01:00
yugecin
31a25b297f more oop shit for state transitions 2017-01-08 11:23:06 +01:00
yugecin
6d8f48a03f switching states using fade transitions 2017-01-07 23:14:10 +01:00
yugecin
ebda622c2c guicy new way of running the app 2017-01-07 14:02:33 +01:00
yugecin
3b49792554 ExGon mover 2017-01-01 23:47:11 +01:00
yugecin
bf4bda949c fix hitbox for storyboard mover delete square 2016-12-26 23:37:13 +01:00
yugecin
b562a50254 getting rid of code repetition 2016-12-26 23:36:25 +01:00
yugecin
af50fc01ad hide merged mirror pool option for now 2016-12-25 21:49:08 +01:00
yugecin
ba10b43f7e fix slider circle animation color on mirrored slider 2016-12-25 21:48:44 +01:00
yugecin
bcb1ca1296 attempts to make the ease middle animation decent 2016-12-25 21:11:12 +01:00
yugecin
1c2fac02be set bezier control points in the middle 2016-12-25 21:10:58 +01:00
yugecin
3b91247d12 don't recreate knorkesliders when loading checkpoint (part of #104) 2016-12-25 18:29:57 +01:00
yugecin
2821a259bd remove a comment 2016-12-25 18:13:32 +01:00
yugecin
b37e03b3be make mirrored curves work 2016-12-25 18:05:00 +01:00
yugecin
9ec2d1a5a8 attempts to merge mirrored curves 2016-12-25 17:30:09 +01:00
yugecin
0e30a1e0e4 option to define merging slider mirror pool 2016-12-25 16:57:09 +01:00
yugecin
0f0695c34a less text padding in simplebutton, rename sbv2 ease middle button 2016-12-25 16:30:30 +01:00
yugecin
2b5ee7d8b8 middle ease animation for sbv2 2016-12-25 16:22:09 +01:00
yugecin
66b174523b fix msb (2/2) 2016-12-25 15:50:43 +01:00
yugecin
ae84696aa6 fix msb (1/2) 2016-12-25 15:50:30 +01:00
yugecin
2c2ba317b9 prevent index out of bounds ex when loading checkpoint at time before first object 2016-12-25 15:47:25 +01:00
yugecin
ad6ba664f9 add animations to storyboardmovers 2016-12-25 15:46:11 +01:00
yugecin
ce1dd5eba1 CubicStoryboardMover 2016-12-25 14:23:10 +01:00
yugecin
7aafd590f6 QuadraticStoryboardMover 2016-12-25 14:19:22 +01:00
yugecin
c219f078fb use renderutils 2016-12-25 14:19:08 +01:00
yugecin
a392875940 renderutils 2016-12-25 14:18:50 +01:00
yugecin
4d528089d2 add multipoint storyboard mover 2016-12-25 13:58:31 +01:00
yugecin
81431067d8 ability to remove movers 2016-12-25 13:19:54 +01:00
yugecin
ddaa8f5bcc add forgotten file (intellij plz, DMITRY PLZ) 2016-12-25 12:42:09 +01:00
yugecin
414e20ec26 recalculate length and times every x ms when moving 2016-12-25 12:41:40 +01:00
yugecin
bf2e71e39b fix wrong length calculation when adding first mover 2016-12-25 12:35:33 +01:00
yugecin
1803d714a5 basic implementation of sbv2 2016-12-25 12:16:32 +01:00
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
yugecin
1ac1b96127 render the checkbox in optionsoverlay in the middle of the line 2016-12-20 19:23:58 +01:00
yugecin
44ad94bfc1 update hoveroption in optionsoverlay when closing a list 2016-12-20 19:22:57 +01: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
c42e7e4399 fix hover option in option menu not updating when scrolling 2016-12-18 21:04:17 +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
48d742bbc5 fix a wild indentation error and spaces 2016-12-12 23:22:12 +01:00
yugecin
f0781ee1c6 fix weird behavior when removing a storyboard option 2016-12-12 21:12:16 +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