Thai Pangsakulyanont
2a3bdec433
and another merge
2011-05-29 23:44:16 +07:00
Thai Pangsakulyanont
8ad9ada0da
merge
2011-05-29 23:42:29 +07:00
Jason Felds
ab303822d7
Fix one binary building warning.
2011-05-29 12:42:22 -04:00
Thai Pangsakulyanont
bb1d829d38
make cancel do nothing.
2011-05-29 23:42:14 +07:00
Jason Felds
842dcba6c3
The tom brothers are good.
2011-05-29 11:50:45 -04:00
Jason Felds
18a4b7459d
Don't get mad, get *shot for obvious reference*
...
...point is, don't focus on those warnings.
2011-05-29 11:46:25 -04:00
Jason Felds
42a3dbcb58
Save our warnings checks for our code.
2011-05-29 11:39:55 -04:00
Henrik Andersson
9038ab8d65
Bail out from the loop if we run out of data.
2011-05-29 17:10:35 +02:00
Jason Felds
1fd5211529
Better message on failure.
2011-05-28 19:05:27 -04:00
Jason Felds
6321a0c7b7
Simplify calls.
2011-05-28 18:20:56 -04:00
Jason Felds
d27b9f6743
Compiling uses ';', linking uses ' '.
2011-05-28 18:14:36 -04:00
Jason Felds
30c0ab9182
It compiles. Now to fix linking.
2011-05-28 18:12:01 -04:00
Jason Felds
d7c7c83a4b
Getting there...time to find jmpbuf replacement.
2011-05-28 18:09:38 -04:00
Jason Felds
3c49e1a94d
Trying to restore Texture Font Generator.
2011-05-28 18:05:00 -04:00
Jason Felds
bf6cac9e71
Use henke37's fixes properly. Add PNG lib.
...
It is now possible to build binaries in VS2010.
I suspect some adjustments are still needed.
2011-05-28 17:37:56 -04:00
Jason Felds
ff3ab6ee9a
Add SongPosition for Split Timing.
...
Hmm...I wonder if this will mess with the compile order.
2011-05-28 17:20:10 -04:00
Jason Felds
5b5cd59ffa
Have to redo PCH stuff for C files.
2011-05-28 17:18:46 -04:00
Jason Felds
71a72225da
Ensure PNG files are compiled.
...
Well...mostly. Where's the ignore PCH setting in VS2010?
2011-05-28 17:04:26 -04:00
Jason Felds
f72dd5a18e
Silly me, forgetting to update the other VM.
2011-05-28 16:29:22 -04:00
Jason Felds
cb4d91e2a7
Guess these filters are needed.
2011-05-28 16:27:03 -04:00
Jason Felds
2ebe35ec4a
Make this a one-liner.
...
Thanks to henke37 for the fix.
2011-05-28 16:18:28 -04:00
Jason Felds
55eb29c665
Revert this...probably rushed it too fast.
...
Let the users choose this one I guess.
2011-05-28 15:43:49 -04:00
Jason Felds
33b0cdbf1e
Ah, I was looking for this option.
...
Not forcing on the other builds for now.
2011-05-28 15:34:20 -04:00
Jason Felds
6f9730b6f9
Better comment.
2011-05-28 12:11:49 -04:00
Jason Felds
79113e7b41
No using scrolls in Song Timing.
2011-05-28 11:37:44 -04:00
Jason Felds
461deced3a
Let's be doubly sure Survivals work.
...
If a themer uses a non-existant default noteskin...
...well, at this point we're not responsible I think.
2011-05-27 23:28:14 -04:00
Jason Felds
202728206d
Expand on failure message.
2011-05-27 16:16:57 -04:00
Jason Felds
34d4fee067
Round 2...FIGHT!
2011-05-27 13:30:12 -04:00
Jason Felds
8782ac01bc
Testing something with another player.
2011-05-27 13:14:33 -04:00
Jonathan Payne
231ae7cb32
test fail
2011-05-27 09:56:52 -07:00
Jason Felds
cfa48c388c
Allow right shift key for rolls.
2011-05-27 12:49:42 -04:00
Jason Felds
a4ebdcc8cc
Added the LoopOnChartEnd metric for the editor.
...
Let the players decide whether to loop or not
when playing charts in the editor.
2011-05-27 12:43:14 -04:00
Jason Felds
40db083a53
Fix off by one error dealing with beat 0.
...
Hopefully nothing else broke.
2011-05-27 12:30:07 -04:00
Jason Felds
6588753328
Comment no longer needed.
2011-05-27 11:14:14 -04:00
Jason Felds
071e04f840
Survival fixed...by a METRIC CHANGE?!?
...
I just...I don't even...GAH!
2011-05-27 11:08:36 -04:00
Jason Felds
84b5cf192e
Don't ignore those warnings!
2011-05-27 10:53:30 -04:00
Jason Felds
283afa4687
Log if a mod isn't loaded for some reason.
2011-05-27 10:42:47 -04:00
Jason Felds
6b4703d2ed
Not a fan of plain ASSERTs.
2011-05-27 10:26:43 -04:00
Jason Felds
002ea6c11a
I want others to read this comment.
...
Check the diff.
2011-05-27 10:12:19 -04:00
Jason Felds
99bed31809
...of course, I am an idiot.
...
Somehow, I forgot to commit the metric itself!
2011-05-27 01:38:08 -04:00
Jason Felds
bfb1310fda
Better comment.
2011-05-26 22:59:29 -04:00
Jason Felds
6bb3fa8d0e
Downgrade to libpng 1.5.1.
...
This restores PNG screenshot colors.
2011-05-26 22:52:30 -04:00
Jason Felds
78951b7f05
Introduce the MissComboIsPerRow metric.
...
Read the changelog for more details.
2011-05-26 22:22:55 -04:00
Jason Felds
f01763598d
Autosync Song + Split Timing = Happy Players! :D
...
The solution: use actual objects, not references.
Big thanks to Edgars Klepers for the hint.
2011-05-26 22:00:37 -04:00
Jason Felds
5838313614
Gotta love dereferencing. NOT!
2011-05-26 21:33:20 -04:00
Jason Felds
f3d3bc7513
AJ, please come back.
2011-05-26 20:45:46 -04:00
Jason Felds
553731836f
Midiman, surprised you didn't commit this.
2011-05-26 20:45:22 -04:00
Colby Klein
c671163bb9
I'm sure this will be appreciated.
2011-05-26 17:28:31 -07:00
Jason Felds
87246efd07
Still moving towards proper syncing.
...
Still...not getting where I need to.
Stepping away a bit more.
2011-05-26 19:19:41 -04:00
Jason Felds
bb5012b283
Do some refactoring...but doesn't solve it.
...
Line 79 is the killer one.
It's supposed to be a vector of TimingData pointers.
Yet it compiles with the address reference.
...anyone here that can take a look?
2011-05-26 18:36:30 -04:00