yugecin
bcb805a23a
Merge branch 'mergemirror'
2016-12-25 18:13:44 +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
eb1b3f3601
Merge branch 'sbv2'
2016-12-25 15:46:50 +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