 Jason Felds
|
e2c8ab809b
|
Umm...had another empty merge here.
|
2011-05-02 21:16:27 -04:00 |
|
|
AJ Kelly
|
fb1dbd4463
|
merge
|
2011-05-02 20:11:26 -05:00 |
|
|
AJ Kelly
|
34e3127a29
|
remove spaces from line begin
|
2011-05-02 20:11:09 -05:00 |
|
|
Jason Felds
|
530a681e48
|
Guess I'm the line ending guardian.
|
2011-05-02 21:07:31 -04:00 |
|
|
Colby Klein
|
39953f16b1
|
Require lower version of GLEW. I don't believe we use anything from newer than 2.1.
|
2011-05-02 17:47:23 -07:00 |
|
|
Colby Klein
|
8c22b4573e
|
merge opengl -> default. this might break d3d (sorry if it does!)
|
2011-05-02 17:35:02 -07:00 |
|
|
Colby Klein
|
b721d0a011
|
[opengl] merge
|
2011-05-02 17:33:20 -07:00 |
|
|
AJ Kelly
|
617b63edc9
|
add python to eol file
|
2011-05-02 17:48:03 -05:00 |
|
|
AJ Kelly
|
830ff6c25a
|
more nsi updates
|
2011-05-02 17:26:15 -05:00 |
|
|
AJ Kelly
|
7076e8631e
|
this is no longer a problem
|
2011-05-02 17:20:02 -05:00 |
|
|
AJ Kelly
|
e3ed7c161e
|
add ssc format changelog (OOPS!) and sm5 changelog to Windows installer
|
2011-05-02 17:18:13 -05:00 |
|
|
AJ Kelly
|
054747b55c
|
[ScreenSelectMusic] Added NullScoreString metric.
|
2011-05-02 17:15:41 -05:00 |
|
|
Colby Klein
|
e9d6fada14
|
Fix compile, rename _Legacy to _OGL so I stop being confused
|
2011-05-02 11:23:37 -07:00 |
|
|
Colby Klein
|
ba478c3974
|
huge merge
|
2011-05-02 10:50:56 -07:00 |
|
|
Colby Klein
|
d69bbdbb9d
|
Fix typo
|
2011-05-02 10:41:59 -07:00 |
|
|
Colby Klein
|
f511d44c06
|
merge
|
2011-05-02 10:37:01 -07:00 |
|
|
Colby Klein
|
464f0f703b
|
PulseAudio has some issue which causes arrows to stutter.
|
2011-05-02 10:36:08 -07:00 |
|
|
AJ Kelly
|
5242246bd9
|
add korean font assets
|
2011-05-02 02:11:28 -05:00 |
|
|
AJ Kelly
|
5341452d5d
|
default png crush part 2
|
2011-05-02 01:48:20 -05:00 |
|
|
AJ Kelly
|
d7ad1dd8e7
|
default png crush part 1
|
2011-05-02 01:44:20 -05:00 |
|
|
AJ Kelly
|
4579ba19b1
|
crush fallback png
|
2011-05-02 01:34:44 -05:00 |
|
|
Jason Felds
|
0e225c39e1
|
Can't forget lua docs on merge.
|
2011-05-02 01:45:33 -04:00 |
|
|
Jason Felds
|
f0d2adfaa9
|
Allow editing Display Max BPM.
This got set to Min by mistake.
|
2011-05-02 01:44:14 -04:00 |
|
|
AJ Kelly
|
18840c97ec
|
update lua docs
|
2011-05-01 23:29:36 -05:00 |
|
|
Jason Felds
|
ab0c1d1c49
|
Don't let .dmg files get added in by mistake.
Yeah, first mainline commit for sm5 is a maintenance job.
Go figure.
|
2011-05-01 21:54:16 -04:00 |
|
|
AJ Kelly
|
af74f336b9
|
sm-ssc v1.2.5
|
2011-05-01 20:27:13 -05:00 |
|
|
Jason Felds
|
8a902dd14d
|
Remember to scale Tickcounts and Combos.
|
2011-05-01 17:28:36 -04:00 |
|
|
Jason Felds
|
626fcdb5bb
|
Simplify, use initializers.
|
2011-05-01 17:20:59 -04:00 |
|
|
AJ Kelly
|
4d5b1fe2a3
|
change default custom speed mods back to pre-arrow spacing change speeds
|
2011-05-01 14:54:12 -05:00 |
|
|
AJ Kelly
|
e200734a6f
|
another pedantic edit
|
2011-05-01 13:41:50 -05:00 |
|
|
AJ Kelly
|
6e6d541124
|
code cleanup
|
2011-05-01 13:30:53 -05:00 |
|
|
Jonathan Payne
|
7fafe7ba70
|
Merge
|
2011-05-01 00:11:22 -07:00 |
|
|
AJ Kelly
|
6aec949c06
|
[Course] Added #SCRIPTER tag and GetScripter Lua binding.
|
2011-04-30 23:30:58 -05:00 |
|
|
AJ Kelly
|
7508f27fc9
|
fix compile
|
2011-04-30 19:40:43 -05:00 |
|
|
AJ Kelly
|
56f503e29b
|
[UnlockManager] Added GetPoints(UnlockRequirement), GetPointsForProfile(Profile,UnlockRequirement) Lua bindings.
|
2011-04-30 19:35:51 -05:00 |
|
|
AJ Kelly
|
93d3f2a063
|
nano cleanup
|
2011-04-30 19:31:21 -05:00 |
|
|
AJ Kelly
|
c5be31ec69
|
[Song] Added Origin (#ORIGIN tag in .ssc)
|
2011-04-30 19:23:29 -05:00 |
|
|
AJ Kelly
|
b053e931c2
|
[UnlockEntry] Added GetCourse, GetCode Lua bindings.
[UnlockManager] Added UnlockRequirement_NumUnlocked enum.
|
2011-04-30 18:41:14 -05:00 |
|
|
AJ Kelly
|
f5976bd860
|
fix late night typo
|
2011-04-30 05:23:35 -05:00 |
|
|
AJ Kelly
|
3d4a439960
|
[OptionRow] Added SelectMultipleMessageCommand, ChangeValueMessageCommand.
|
2011-04-30 05:22:17 -05:00 |
|
|
AJ Kelly
|
8dfa27df5e
|
[OptionRow] Added Text param to RefreshMessageCommand.
|
2011-04-30 05:11:16 -05:00 |
|
|
AJ Kelly
|
3869c69098
|
[ScreenOptions] Renamed "ScreenOptions LineHighlight" to "ScreenOptions LineHighlight P#", making it load per-player.
|
2011-04-30 03:45:16 -05:00 |
|
|
Jason Felds
|
1e2404918b
|
Umm...empty merge? How'd that happen?
Alright, hopefully it won't act up anymore.
|
2011-04-29 15:03:39 -04:00 |
|
|
Jason Felds
|
a9a98e6529
|
Line endings hate me now.
|
2011-04-29 15:03:05 -04:00 |
|
|
Jason Felds
|
ef1ebe9a5a
|
Line ending fix (again?)
|
2011-04-29 14:58:59 -04:00 |
|
|
Jason Felds
|
5d78163b89
|
I could have sworn we fixed this line ending thing.
It's just not my day.
|
2011-04-29 14:57:52 -04:00 |
|
|
AJ Kelly
|
3af2739300
|
fuck fuck fuck fuck fuck i'm going to PUNCH someone
|
2011-04-29 13:26:20 -05:00 |
|
|
AJ Kelly
|
14e07cbb61
|
planning stuff for musicwheel
|
2011-04-29 13:25:58 -05:00 |
|
|
AJ Kelly
|
09742fa72a
|
small comment
|
2011-04-29 13:25:37 -05:00 |
|
|
Jason Felds
|
cd31dd73d8
|
Remove the long list of manually typed numbers.
Again, relying on global constants here.
|
2011-04-29 13:45:13 -04:00 |
|