This website requires JavaScript.
2a3bdec433
and another merge
Thai Pangsakulyanont
2011-05-29 23:44:16 +07:00
8ad9ada0da
merge
Thai Pangsakulyanont
2011-05-29 23:42:29 +07:00
ab303822d7
Fix one binary building warning.
Jason Felds
2011-05-29 12:42:22 -04:00
bb1d829d38
make cancel do nothing.
Thai Pangsakulyanont
2011-05-29 23:42:14 +07:00
842dcba6c3
The tom brothers are good.
Jason Felds
2011-05-29 11:50:45 -04:00
18a4b7459d
Don't get mad, get *shot for obvious reference*
Jason Felds
2011-05-29 11:46:25 -04:00
42a3dbcb58
Save our warnings checks for our code.
Jason Felds
2011-05-29 11:39:55 -04:00
9038ab8d65
Bail out from the loop if we run out of data.
Henrik Andersson
2011-05-29 17:10:35 +02:00
1fd5211529
Better message on failure.
Jason Felds
2011-05-28 19:05:27 -04:00
6321a0c7b7
Simplify calls.
Jason Felds
2011-05-28 18:20:56 -04:00
d27b9f6743
Compiling uses ';', linking uses ' '.
Jason Felds
2011-05-28 18:14:36 -04:00
30c0ab9182
It compiles. Now to fix linking.
Jason Felds
2011-05-28 18:12:01 -04:00
d7c7c83a4b
Getting there...time to find jmpbuf replacement.
Jason Felds
2011-05-28 18:09:38 -04:00
3c49e1a94d
Trying to restore Texture Font Generator.
Jason Felds
2011-05-28 18:05:00 -04:00
bf6cac9e71
Use henke37's fixes properly. Add PNG lib.
Jason Felds
2011-05-28 17:37:56 -04:00
ff3ab6ee9a
Add SongPosition for Split Timing.
Jason Felds
2011-05-28 17:20:10 -04:00
5b5cd59ffa
Have to redo PCH stuff for C files.
Jason Felds
2011-05-28 17:18:46 -04:00
71a72225da
Ensure PNG files are compiled.
Jason Felds
2011-05-28 17:04:26 -04:00
f72dd5a18e
Silly me, forgetting to update the other VM.
Jason Felds
2011-05-28 16:29:22 -04:00
cb4d91e2a7
Guess these filters are needed.
Jason Felds
2011-05-28 16:27:03 -04:00
2ebe35ec4a
Make this a one-liner.
Jason Felds
2011-05-28 16:18:28 -04:00
55eb29c665
Revert this...probably rushed it too fast.
Jason Felds
2011-05-28 15:43:49 -04:00
33b0cdbf1e
Ah, I was looking for this option.
Jason Felds
2011-05-28 15:34:20 -04:00
6f9730b6f9
Better comment.
Jason Felds
2011-05-28 12:11:49 -04:00
79113e7b41
No using scrolls in Song Timing.
Jason Felds
2011-05-28 11:37:44 -04:00
461deced3a
Let's be doubly sure Survivals work.
Jason Felds
2011-05-27 23:28:14 -04:00
202728206d
Expand on failure message.
Jason Felds
2011-05-27 16:16:57 -04:00
34d4fee067
Round 2...FIGHT!
Jason Felds
2011-05-27 13:30:12 -04:00
8782ac01bc
Testing something with another player.
Jason Felds
2011-05-27 13:14:33 -04:00
231ae7cb32
test fail
Jonathan Payne
2011-05-27 09:56:52 -07:00
cfa48c388c
Allow right shift key for rolls.
Jason Felds
2011-05-27 12:49:42 -04:00
a4ebdcc8cc
Added the LoopOnChartEnd metric for the editor.
Jason Felds
2011-05-27 12:43:14 -04:00
40db083a53
Fix off by one error dealing with beat 0.
Jason Felds
2011-05-27 12:30:07 -04:00
6588753328
Comment no longer needed.
Jason Felds
2011-05-27 11:14:14 -04:00
071e04f840
Survival fixed...by a METRIC CHANGE?!?
Jason Felds
2011-05-27 11:08:36 -04:00
84b5cf192e
Don't ignore those warnings!
Jason Felds
2011-05-27 10:53:30 -04:00
283afa4687
Log if a mod isn't loaded for some reason.
Jason Felds
2011-05-27 10:42:47 -04:00
6b4703d2ed
Not a fan of plain ASSERTs.
Jason Felds
2011-05-27 10:26:43 -04:00
002ea6c11a
I want others to read this comment.
Jason Felds
2011-05-27 10:12:19 -04:00
99bed31809
...of course, I am an idiot.
Jason Felds
2011-05-27 01:38:08 -04:00
bfb1310fda
Better comment.
Jason Felds
2011-05-26 22:59:29 -04:00
6bb3fa8d0e
Downgrade to libpng 1.5.1.
Jason Felds
2011-05-26 22:52:30 -04:00
78951b7f05
Introduce the MissComboIsPerRow metric.
Jason Felds
2011-05-26 22:22:55 -04:00
f01763598d
Autosync Song + Split Timing = Happy Players! :D
Jason Felds
2011-05-26 22:00:37 -04:00
5838313614
Gotta love dereferencing. NOT!
Jason Felds
2011-05-26 21:33:20 -04:00
f3d3bc7513
AJ, please come back.
Jason Felds
2011-05-26 20:45:46 -04:00
553731836f
Midiman, surprised you didn't commit this.
Jason Felds
2011-05-26 20:45:22 -04:00
c671163bb9
I'm sure this will be appreciated.
Colby Klein
2011-05-26 17:28:31 -07:00
87246efd07
Still moving towards proper syncing.
Jason Felds
2011-05-26 19:19:41 -04:00
bb5012b283
Do some refactoring...but doesn't solve it.
Jason Felds
2011-05-26 18:36:30 -04:00
2d491fd0c0
Add ScrollSegment checks.
Jason Felds
2011-05-26 17:38:31 -04:00
2bb6349ade
Ignore DiffMerge comparison files.
Jason Felds
2011-05-26 17:38:03 -04:00
a71eb1afd2
Reverting sync seems alright.
Jason Felds
2011-05-26 15:38:15 -04:00
4802ea678f
Storing original timing data seems fine.
Jason Felds
2011-05-26 15:10:22 -04:00
43f0fb96e1
Reactivate ed78fa2 .
Jason Felds
2011-05-26 14:57:28 -04:00
0270191fef
We'll need the Steps to be included first.
Jason Felds
2011-05-26 14:46:08 -04:00
102a2e7a8e
empty() test confirmed.
Jason Felds
2011-05-26 14:41:52 -04:00
c925e687fe
So far, so good: no breakage.
Jason Felds
2011-05-26 14:35:54 -04:00
3c43429f0d
Add targeted comments.
Jason Felds
2011-05-26 14:19:13 -04:00
17bea0aab7
Doxygen, restart of autosync split timing.
Jason Felds
2011-05-26 14:11:11 -04:00
e99178c02d
Signed vs unsigned warning.
Jason Felds
2011-05-25 15:09:10 -04:00
86e70e1a83
Bring in the scroll branch.
Jason Felds
2011-05-25 14:40:18 -04:00
b1cd93963d
[scroll] merge
Thai Pangsakulyanont
2011-05-26 01:14:27 +07:00
7f4d517861
revert en.ini (to avoid merge conflicts)
Thai Pangsakulyanont
2011-05-26 01:14:04 +07:00
372540e3a4
Bringing Thai's fix in for Warps and Delays.
Thai Pangsakulyanont
2011-05-26 01:12:41 +07:00
8b159a9df7
make GetClosestNote and GetClosestNonEmptyRow seconds based, and not time-based.
Thai Pangsakulyanont
2011-05-26 01:12:41 +07:00
1a7fa64924
[scroll] Languages update.
Jason Felds
2011-05-25 14:11:17 -04:00
5f8353bdd0
Use Step Timing if steps are already on Splits.
Jason Felds
2011-05-25 14:07:53 -04:00
8f35c048b8
[scroll] mergefix
Thai Pangsakulyanont
2011-05-25 23:48:34 +07:00
d9f936190a
[default -> scroll] merge
Thai Pangsakulyanont
2011-05-25 22:56:26 +07:00
5e88041b5e
strings
Thai Pangsakulyanont
2011-05-25 22:54:57 +07:00
fe9573975c
[scroll] 90% of scroll segments
Thai Pangsakulyanont
2011-05-25 22:44:41 +07:00
c5bbeb69ca
Empty notes don't get judged (RandomVanish).
Jason Felds
2011-05-24 22:14:59 -04:00
8d2f1017e1
Enforce validation on TapNote types.
Jason Felds
2011-05-24 22:13:22 -04:00
b3cebd2aaf
No need to swap if it's the same column.
Jason Felds
2011-05-24 21:29:51 -04:00
2afdaf6705
Don't define a variable until it's needed.
Jason Felds
2011-05-24 21:15:59 -04:00
ded36d6f19
I need to pull more often.
Jason Felds
2011-05-24 15:02:16 -04:00
b2a5a68b4a
Super Shuffle works with fakes now.
Jason Felds
2011-05-24 15:01:52 -04:00
ccc66ccaeb
disable editing wait and mode on a row without a speed segment. enabling it is no-op anyway.
Thai Pangsakulyanont
2011-05-24 13:30:21 +07:00
ddbecd5de4
add a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warps
Thai Pangsakulyanont
2011-05-24 13:07:59 +07:00
51229ad086
limit searching to 16 beats
Thai Pangsakulyanont
2011-05-24 12:44:48 +07:00
0533e742c5
a const is need on TimingData.cpp too
Thai Pangsakulyanont
2011-05-24 12:29:55 +07:00
5cde717547
GetDisplayedSpeedPercent should be const
Thai Pangsakulyanont
2011-05-24 12:27:03 +07:00
aa0eb7f5d7
GetSpeedMultiplier in ArrowEffects becomes TimingData::GetDisplayedSpeedPercent. We might need to use it later in other parts (NoteField).
Thai Pangsakulyanont
2011-05-24 11:43:08 +07:00
0994bd64bc
fix crash in NotesLoaderBMS
Thai Pangsakulyanont
2011-05-24 11:12:47 +07:00
e7df4edbe1
what? I don't really know what I'm doing here.
Thai Pangsakulyanont
2011-05-24 10:47:16 +07:00
631bc3753d
Revert "An attempt to make the arrows flash with the steps' timing. If it works then we can expand it to..... I don't know, lifebars?"
Thai Pangsakulyanont
2011-05-24 10:41:07 +07:00
aa706d34d7
Revert "Fix a typo (that makes building fail)."
Thai Pangsakulyanont
2011-05-24 10:40:22 +07:00
1d88598eaf
Revert "finally got it to work with a another hack inside that hack."
Thai Pangsakulyanont
2011-05-24 10:40:04 +07:00
dbdfe7bd1b
bit o' sm5 rebranding shit
Flameshadowxeroshin
2011-05-23 20:40:08 -05:00
137d83cc1b
<AJ>MEEEEEEEEEEEERGE!</AJ>
Jason Felds
2011-05-23 21:31:56 -04:00
7fe13ebacb
Add the Steps::UsesSplitTiming binding.
Jason Felds
2011-05-23 21:31:30 -04:00
727a0c7f1b
...can't believe I missed this entry.
Jason Felds
2011-05-23 21:30:31 -04:00
8363f585c4
adding these so hg will quiet down
Jonathan Payne
2011-05-23 18:02:19 -07:00
966dc33e3f
Can't forget theme stuff.
Jason Felds
2011-05-23 20:28:01 -04:00
004a01b306
doxygen fixes.
Jason Felds
2011-05-23 20:27:31 -04:00
5dd656ba70
I dont think the filter caught these for some reason either.
Jonathan Payne
2011-05-23 14:24:01 -07:00
a6842427fa
better difficultydisplay, edits count doesnt work sadly.
Jonathan Payne
2011-05-23 14:23:41 -07:00
49a32ae552
this should be an i.
Thai Pangsakulyanont
2011-05-24 01:00:27 +07:00
0f1e2c59ed
Updated comment/TODO.
Jason Felds
2011-05-23 11:26:53 -04:00