yugecin
|
badae5f85c
|
Merge remote-tracking branch 'remotes/original/master' into upstream
# Conflicts:
# src/itdelatrisu/opsu/objects/Slider.java
|
2016-12-10 11:00:58 +01:00 |
|
Jeffrey Han
|
e6ca847d17
|
Follow-up to #209: minor consistency changes.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
2016-12-09 23:15:47 -05:00 |
|
yugecin
|
848f83ed29
|
hide scoreboard if 'hide all UI' option is enabled
|
2016-12-10 01:35:48 +01:00 |
|
yugecin
|
c0acb7ad6b
|
Merge branch 'yugecin/opsu/aspire-fix'
# Conflicts:
# src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
|
2016-12-10 01:32:04 +01:00 |
|
yugecin
|
e878f0fb0d
|
Merge branch 'master' of https://github.com/itdelatrisu/opsu into 'upstream'
# Conflicts:
# README.md
# src/itdelatrisu/opsu/Opsu.java
# src/itdelatrisu/opsu/Utils.java
# src/itdelatrisu/opsu/render/CurveRenderState.java
# src/itdelatrisu/opsu/states/Game.java
|
2016-12-10 01:19:31 +01:00 |
|
yugecin
|
fdf936e47b
|
fade in/out letterboxes during breaks
|
2016-12-10 00:13:07 +01:00 |
|
yugecin
|
915728ec24
|
force break end when next object shows
|
2016-12-09 23:13:05 +01:00 |
|
yugecin
|
4c64eee4db
|
fix rendering too much merged slider after loading checkpoint
|
2016-12-09 22:09:50 +01:00 |
|
yugecin
|
2000aacde3
|
remove some commented stuff
|
2016-12-09 22:02:02 +01:00 |
|
yugecin
|
5989c50456
|
fix #94
|
2016-12-07 13:35:29 +01:00 |
|
yugecin
|
e3fdd73e36
|
fix wrong trackposition during lead in caused by music offsets
|
2016-12-04 22:45:05 +01:00 |
|
yugecin
|
a3af1c71b8
|
attemt to fix shrinking sliders with odd amount of repeats with merged slider rendering
|
2016-12-04 21:52:15 +01:00 |
|
yugecin
|
00fcf0ebc1
|
add options for slider styles and make it all work
|
2016-12-04 17:35:55 +01:00 |
|
yugecin
|
580f11a3d3
|
draw sliders on correct times
|
2016-12-03 19:11:36 +01:00 |
|
yugecin
|
89245d9976
|
first attempt at merging sliders
|
2016-12-03 18:39:20 +01:00 |
|
yugecin
|
6ef16bce36
|
fix not being able to skip when epilepsy warning is taking its time
|
2016-11-20 22:41:33 +01:00 |
|
yugecin
|
44bcaf06f9
|
fix npe caused be last commit changes
|
2016-11-20 22:27:16 +01:00 |
|
yugecin
|
63144426d1
|
new cursor override: use next object's colors (close #43)
|
2016-11-20 22:10:17 +01:00 |
|
yugecin
|
e18eba17de
|
make dancer code more resilient to storyboard changes
|
2016-11-20 18:35:20 +01:00 |
|
yugecin
|
cdd88d9a8d
|
merge the movers into one list, use java8 for default impl in interfaces
|
2016-11-20 17:24:58 +01:00 |
|
yugecin
|
30186b94f4
|
getting rid of repetitions
|
2016-11-20 17:01:56 +01:00 |
|
yugecin
|
726fef9b38
|
Merge branch 'Awlexus-master' into pullreqs
|
2016-11-20 14:22:54 +01:00 |
|
yugecin
|
da90c98fce
|
ability to change map offset while playing (- and + keys)
|
2016-11-20 13:49:53 +01:00 |
|
yugecin
|
319b40dfdb
|
hide epilepsy warning when skipping intro
|
2016-11-20 13:31:44 +01:00 |
|
yugecin
|
896ba657a7
|
don't show epilepsy img when jumping object index using sb
|
2016-11-20 13:30:02 +01:00 |
|
Awlex
|
b36d7d487f
|
Remodeled PolyMoverFactories and Movers, to be more effizient and userfriendly
|
2016-11-20 04:42:46 +01:00 |
|
Awlex
|
6f5f17da74
|
First try integrating a Arc. Status: Still alot to do
|
2016-11-19 02:33:15 +01:00 |
|
yugecin
|
a1a9dde5ae
|
add epilepsy warning img
|
2016-11-17 00:12:44 +01:00 |
|
yugecin
|
4b5fab5050
|
add map start & end delay adjustable (#10 optimalisation)
|
2016-11-13 04:17:28 +01:00 |
|
yugecin
|
d869f2ef48
|
save settings on enter, revert on leave
|
2016-11-13 00:14:38 +01:00 |
|
yugecin
|
15f560ee68
|
some interaction fixes
|
2016-11-12 23:55:39 +01:00 |
|
yugecin
|
43e1109f40
|
make the menu work
|
2016-11-12 23:31:18 +01:00 |
|
yugecin
|
f466fafa03
|
skip through objects
|
2016-11-12 23:13:41 +01:00 |
|
yugecin
|
b584dcaf68
|
overlays, draw an optionmenu
|
2016-11-12 22:30:22 +01:00 |
|
yugecin
|
ceb6751831
|
leadin delay 2s
|
2016-11-12 19:04:40 +01:00 |
|
yugecin
|
7276705533
|
add 5s delay after last hitobj
|
2016-11-12 18:44:04 +01:00 |
|
yugecin
|
3dc0ad8c68
|
get tick points from slider
|
2016-11-12 18:25:44 +01:00 |
|
Jeffrey Han
|
79bfa1c255
|
Properly fix #177.
Previous fix (#186) threw NPE upon failing a song. Thanks to #155.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
2016-10-13 17:51:51 -04:00 |
|
Jeffrey Han
|
3b847d088d
|
Follow-up to #155.
Some code cleanup and tweaks to the scoreboard display.
|
2016-10-13 14:41:58 -04:00 |
|
Jeffrey Han
|
21579daa26
|
Merge pull request #155 from mad-s/master
Add ingame scoreboard
|
2016-10-13 14:15:02 -04:00 |
|
yugecin
|
255280de95
|
fix 'use last objects color' cursor color override using the color before the object was hit
|
2016-10-10 23:46:20 +02:00 |
|
yugecin
|
177e75ba29
|
show github link in playfield
|
2016-10-04 14:40:41 +02:00 |
|
yugecin
|
5c2fc16124
|
use better spinnerdelay
|
2016-10-04 13:43:08 +02:00 |
|
yugecin
|
7ab4e4263f
|
Don't hide ui in break periods when auto isn't active
|
2016-10-02 10:47:48 +02:00 |
|
yugecin
|
0ef65e2dd1
|
Fix pippi using a wrong radius in the beginning
|
2016-10-01 21:40:58 +02:00 |
|
yugecin
|
6ad4348d7c
|
fix start
|
2016-10-01 15:47:01 +02:00 |
|
yugecin
|
b6c8b9753e
|
add key for single mirror object
|
2016-10-01 15:24:30 +02:00 |
|
yugecin
|
f93fab1874
|
fix mirrorFrom
|
2016-10-01 15:16:34 +02:00 |
|
yugecin
|
e08d5f2a83
|
use mapid to decide starting hue for rainbow objects, also use mapid instead of title for direction etc
|
2016-10-01 15:10:20 +02:00 |
|
yugecin
|
3a507453f9
|
Use map title to get initial rainbow colors
|
2016-10-01 15:00:12 +02:00 |
|