Commit Graph

1003 Commits

Author SHA1 Message Date
yugecin
a7813e1ffe revert 39b24b5 (attempt to load normal image if there's no array (load sliderb if there's no sliderb0, sliderb1 etc)) and fix it by loading the skin image before checking if default skin has multiple images (animation) 2017-02-02 01:15:10 +01:00
yugecin
62b5d574da default back button 2017-02-02 01:06:56 +01:00
yugecin
e7e3672491 use dropdown menus 2017-01-30 00:53:28 +01:00
yugecin
c00b2b877a apply upstream fixes 2017-01-29 22:55:11 +01:00
yugecin
1745ae73a1 More optionmenu description changes 2017-01-29 19:49:57 +01:00
yugecin
9243570730 pre-revalidate songmenu state to prevent first time entering lag 2017-01-29 18:22:00 +01:00
yugecin
07ed654a99 update option names 2017-01-29 18:18:25 +01:00
yugecin
59ef4b37e5 fix option searching 2017-01-29 16:53:14 +01:00
yugecin
49c6542fb4 javadocz 2017-01-29 16:26:45 +01:00
yugecin
82bbb4299d allow slight overscrolling in optionsmenu 2017-01-29 16:23:52 +01:00
yugecin
ac398bf2ad kinetic scrolling in optionmenu 2017-01-29 15:33:01 +01:00
yugecin
60d1d8e3ee mopre option grouping 2017-01-29 14:08:17 +01:00
yugecin
7e135550e0 enchanced optionmenu 2017-01-29 11:28:24 +01:00
yugecin
90f764c5bb uppercase screenshot formats for optionsmenu 2017-01-29 00:20:56 +01:00
yugecin
194e41189e enable shrinking & merging sliders options by default 2017-01-27 10:54:35 +01:00
yugecin
ae96571f58 bubble notif when beatmap cannot be parsed 2017-01-22 15:02:24 +01:00
yugecin
ba5ad92cc0 remove deleted options from the optionmenu 2017-01-22 12:11:30 +01:00
yugecin
5752aec58c remove the watermark 2017-01-22 00:15:54 +01:00
yugecin
6b6947f680 remove extra import (close #123) 2017-01-21 23:52:48 +01:00
yugecin
36aaccda29 replace all calls to old bar notif with new method 2017-01-21 23:52:19 +01:00
yugecin
02ef422003 remove old bar notification code 2017-01-21 15:49:54 +01:00
yugecin
7f1abb085f rename ResolutionChanged event to ResolutionOrSkinChanged 2017-01-21 15:30:07 +01:00
yugecin
a489ee24d6 shortcut to reload skin 2017-01-21 15:18:04 +01:00
yugecin
6c461fa645 update resolution & skin option descriptions 2017-01-21 14:56:34 +01:00
yugecin
a69d334dfe fix old skin sounds being used when changing skins 2017-01-21 14:41:51 +01:00
yugecin
40268c3232 hide cursor when viewing replay 2017-01-21 14:36:59 +01:00
yugecin
f233fbf2e6 fix not being able to watch replays 2017-01-21 14:35:33 +01:00
yugecin
7ec4d7db46 only hide cursor ingame when auto(pilot) is active 2017-01-21 14:33:47 +01:00
yugecin
f523328cb3 change skin on the fly 2017-01-21 14:31:03 +01:00
yugecin
7261793999 allow spaces in skin colors 2017-01-21 14:27:03 +01:00
yugecin
83df73fc04 on the fly resolution changing 2017-01-21 14:23:34 +01:00
yugecin
030f204e54 reset cursor location on leaving game 2017-01-21 13:30:10 +01:00
yugecin
b2f85edb13 fix nullpointer for mover storyboard 2017-01-21 13:29:10 +01:00
yugecin
4dc8b34557 fix not being able to enter O in the search bar in songmenu 2017-01-21 13:17:22 +01:00
yugecin
978a41116c enable cursor 2017-01-21 13:11:34 +01:00
yugecin
95a466f92f removing now unused classes 2017-01-21 01:17:47 +01:00
yugecin
f730935622 use the new errorhandler & bubble notifs 2017-01-21 01:16:27 +01:00
yugecin
0af6bc8c09 return to songmenu when closing game ranking screen 2017-01-19 19:52:13 +01:00
yugecin
2d0e2143d1 convert gamepausemenu 2017-01-19 19:43:47 +01:00
yugecin
a3df6e12d6 convert game 2017-01-19 19:23:31 +01:00
yugecin
4b2f29df98 convert gameranking 2017-01-19 16:16:30 +01:00
yugecin
e7eec14341 add options menu as overlay 2017-01-19 16:03:53 +01:00
yugecin
04449abe62 readd search field and sort menu in songmenu 2017-01-18 23:08:23 +01:00
yugecin
e9046ed65e remove the reset method from mainmenu 2017-01-18 22:50:18 +01:00
yugecin
06a5deb3a1 process common hotkeys in base state 2017-01-18 22:46:45 +01:00
yugecin
81b71d5703 convert download state 2017-01-18 22:36:09 +01:00
yugecin
6f7e4242da correct red color for bubble notifs 2017-01-18 21:55:06 +01:00
yugecin
c4560ae9f1 stop loading stuff when close is requested in splash state 2017-01-18 19:44:54 +01:00
yugecin
0eac32505b destroy even more images when closing 2017-01-18 19:40:31 +01:00
yugecin
156026bd9b destroy all images when closing 2017-01-18 19:33:58 +01:00
yugecin
c03897a47d convert buttonmenu 2017-01-18 19:06:45 +01:00
yugecin
4416416813 fix songmenu delta 2017-01-18 18:20:47 +01:00
yugecin
54917091de fix tooltip causing crash 2017-01-18 17:32:40 +01:00
yugecin
7004c9ef4d convert songmenu 2017-01-18 17:31:29 +01:00
yugecin
4541b507f2 remove placeholder println 2017-01-18 16:56:12 +01:00
yugecin
02863de1cf add code to exit from code 2017-01-18 16:55:30 +01:00
yugecin
605dcec605 bubble notif when fullscreen is not supported + changed bubble colors 2017-01-18 11:59:30 +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
18d579eb62 smallbold font and newlines when wrapping text (itdelatrisu/opsu@21aa72b) 2017-01-17 13:37:47 +01:00
yugecin
68ac7f3d10 ErrorHandler 2017-01-11 20:41:13 +01:00
yugecin
3b49792554 ExGon mover 2017-01-01 23:47:11 +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
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
2b5ee7d8b8 middle ease animation for sbv2 2016-12-25 16:22:09 +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
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
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