 Jason Felds
|
b56c3306bd
|
Let's see what the merge diagram looks like now.
|
2011-02-25 11:13:09 -05:00 |
|
|
Jason Felds
|
01f29c7995
|
More doxygen.
|
2011-02-25 11:12:04 -05:00 |
|
|
Thai Pangsakulyanont
|
686869f0a3
|
lol break
|
2011-02-25 20:43:35 +07:00 |
|
|
Thai Pangsakulyanont
|
1aa51dca15
|
Autokeysound transformation!
|
2011-02-25 20:42:50 +07:00 |
|
|
AJ Kelly
|
38007eac91
|
cleanup of whitespace again
|
2011-02-25 04:19:44 -06:00 |
|
|
AJ Kelly
|
4eb8117ee7
|
whitespace, commenting...
|
2011-02-25 04:14:34 -06:00 |
|
|
AJ Kelly
|
63352110ea
|
whitespace cleanup
|
2011-02-25 04:13:37 -06:00 |
|
|
Colby Klein
|
c2dbfabb0c
|
woops. merge
|
2011-02-25 02:09:55 -08:00 |
|
|
Colby Klein
|
dc493450bf
|
Break cel shading (it'll be fixed soon, I have to poke at RageDisplay stuff), add TODOs for myself, and comment out some 2D character stuff... 2d chars should be possible to implement in lua instead.
|
2011-02-25 02:08:30 -08:00 |
|
|
AJ Kelly
|
2f01969781
|
smpackage blargh stuff
|
2011-02-25 01:59:47 -06:00 |
|
|
Jason Felds
|
425246acb2
|
Gotta love merging.
|
2011-02-25 01:57:47 -05:00 |
|
|
Jason Felds
|
f9371eb415
|
More doxygen.
|
2011-02-25 01:57:34 -05:00 |
|
|
AJ Kelly
|
bb1e1a297f
|
try to avoid a crash here, at the expense of it possibly not logging in for some people... please send log info if it happens to you.
|
2011-02-25 00:55:38 -06:00 |
|
|
Jason Felds
|
58e4e13025
|
More doxygen.
|
2011-02-25 01:46:01 -05:00 |
|
|
Jason Felds
|
5af4d1449f
|
Another bot test.
|
2011-02-24 23:15:04 -05:00 |
|
|
Jason Felds
|
ebd7300363
|
More doxygen.
|
2011-02-24 23:08:51 -05:00 |
|
|
Colby Klein
|
9a88c8ec54
|
Comment out (build breaking) mouse code for OS X, fix 3d noteskins + characters at the same time (I hope)
|
2011-02-24 20:04:00 -08:00 |
|
|
Jason Felds
|
2540b0b1e8
|
Add doxygen. Test sm-ssc bot reporting.
|
2011-02-24 22:55:05 -05:00 |
|
|
AJ Kelly
|
e1b7f7c2bf
|
kill some extra whitespace
|
2011-02-24 14:09:53 -06:00 |
|
|
AJ Kelly
|
2be07e74f4
|
shut up, warning
|
2011-02-24 14:09:10 -06:00 |
|
|
AJ Kelly
|
26a2cd2155
|
4,1M07,01E08,01R09,01G11,01E 12,01R06,01A04,01G07,01E
(merge rage)
|
2011-02-24 00:57:21 -06:00 |
|
|
AJ Kelly
|
b73a2bb153
|
[NotesLoaderSSC] Allowed reading of #NOTES2 again.
|
2011-02-24 00:55:19 -06:00 |
|
|
Thai Pangsakulyanont
|
69ff65b9a7
|
Changed hold notes timing.
|
2011-02-24 13:54:56 +07:00 |
|
|
Jason Felds
|
e8ed23db98
|
Fix the warning I left by mistake.
|
2011-02-24 01:53:34 -05:00 |
|
|
AJ Kelly
|
bbb5ae1f16
|
I keep messing around with it
|
2011-02-24 00:50:31 -06:00 |
|
|
AJ Kelly
|
8deb69ec57
|
update the future EffectAction and EffectType enums
|
2011-02-24 00:22:42 -06:00 |
|
|
AJ Kelly
|
8c3eda6315
|
yup, I continue to work on this new effect system for Actors. one day it might even get finished!
|
2011-02-24 00:14:53 -06:00 |
|
|
AJ Kelly
|
8d4fa6a289
|
change comment order
|
2011-02-23 23:54:03 -06:00 |
|
|
AJ Kelly
|
ac8aa2a7dd
|
more of that new Effect stack planning
|
2011-02-23 23:53:49 -06:00 |
|
|
AJ Kelly
|
2153ba0dae
|
archutils\Win32\ cleanup and comment
|
2011-02-23 22:59:15 -06:00 |
|
|
Jason Felds
|
7cfe2844a9
|
Attempt better assertion message.
This may not fix the issue at present due to this going
in 1.2.(something higher than 2).
|
2011-02-23 23:47:24 -05:00 |
|
|
AJ Kelly
|
6c0290d6ce
|
attempt to fix compile, but will likely still fail
|
2011-02-23 21:53:53 -06:00 |
|
|
Jason Felds
|
a89f5a61a6
|
Add include.
Still broken compile.
|
2011-02-23 22:17:29 -05:00 |
|
|
AJ Kelly
|
2c6f990f7d
|
update comments
|
2011-02-23 21:06:24 -06:00 |
|
|
AJ Kelly
|
d980029b29
|
question some logic decisions I made
|
2011-02-23 21:02:37 -06:00 |
|
|
Thai Pangsakulyanont
|
e942c4b3d4
|
improvements on keysounds logic for hold notes
|
2011-02-24 09:47:57 +07:00 |
|
|
AJ Kelly
|
46a39029d1
|
fix compile on windows
|
2011-02-23 20:44:40 -06:00 |
|
|
AJ Kelly
|
e01def85ec
|
attempt to make mouse x/y work
|
2011-02-23 20:39:51 -06:00 |
|
|
AJ Kelly
|
3ed8b14c47
|
alright, this may help out some, but there's still no path to INPUTFILTER yet... need to get x and y coordinates
|
2011-02-23 20:01:14 -06:00 |
|
|
Jason Felds
|
38706cc50e
|
I said, yes go.
|
2011-02-23 20:51:37 -05:00 |
|
|
Jason Felds
|
ffeb0e47b2
|
easing scope was a yes go
|
2011-02-23 20:50:40 -05:00 |
|
|
AJ Kelly
|
b69ccaf0f6
|
easing scope was a no go
|
2011-02-23 19:50:00 -06:00 |
|
|
AJ Kelly
|
d00b672898
|
ease scope, in an attempt to dodge a warning
|
2011-02-23 19:47:25 -06:00 |
|
|
AJ Kelly
|
eed951e046
|
more MouseDevice changes
|
2011-02-23 19:44:04 -06:00 |
|
|
AJ Kelly
|
c5abc5ca50
|
no more mousewheel (should be using z axis)
|
2011-02-23 19:40:55 -06:00 |
|
|
AJ Kelly
|
003f403f0c
|
branch merge
|
2011-02-23 19:40:03 -06:00 |
|
|
AJ Kelly
|
0a3a47086c
|
may want to assign m_Mouse...
|
2011-02-23 19:39:18 -06:00 |
|
|
Jason Felds
|
105608cf08
|
DiffMerge test successful.
|
2011-02-23 20:39:07 -05:00 |
|
|
Jason Felds
|
55187277f8
|
Blank line warnings.
|
2011-02-23 20:37:24 -05:00 |
|
|
AJ Kelly
|
75e050008b
|
comment out assert, but this may not be the end
|
2011-02-23 19:36:46 -06:00 |
|