Jason Felds
5fd75f49ce
Nothing against goto, but this must goto trash.
...
...ugh. Bad pun.
2013-01-24 22:18:24 -05:00
Devin J. Pohly
7703070817
merge from upstream
2013-01-24 00:43:15 -05:00
Devin J. Pohly
533b0f9eff
NotesWriterSSC: fix steps offset when saving
2013-01-24 00:20:56 -05:00
Devin J. Pohly
ce507b9800
use empty TimingData in Steps to signify fallback on Song timing.
...
This required using the new Steps::GetTimingData function and the allowEmpty
parameter to TimingData::TidyUpData when appropriate, as well as clearing the
TimingData to remove step timing rather than coping the song timing over it.
Fixes some odd editor behavior when changing song timing, and is overall a
slightly less hacky way of doing things.
2013-01-23 14:51:18 -05:00
Devin J. Pohly
0ae7b0da85
TimingData: add allowEmpty parameter to TidyUpData. always false for now...
2013-01-23 14:38:57 -05:00
Greg Cotton
31e74ad8ac
Don't sign machine profiles on initialization. (Was based on variable.)
2013-01-22 18:37:24 -05:00
Devin J. Pohly
3d6f1c5227
ScreenEdit: handle beat-0 offset the same as other timing data
2013-01-21 23:13:38 -05:00
Devin J. Pohly
234cbf4281
ScreenEdit: add GetAppropriateStepsForUpdate function
2013-01-21 22:53:12 -05:00
Devin J. Pohly
4385b9242d
Steps: add GetTimingData function that falls back on Song if necessary
2013-01-20 21:12:11 -05:00
Devin J. Pohly
8815da5f1f
replace SongManager::GetSongFromSteps with use of song pointer
2013-01-20 19:51:59 -05:00
Devin J. Pohly
afaa382b84
Steps: set Song pointer to associated song when constructing
2013-01-20 19:23:28 -05:00
Devin J. Pohly
1327fa6356
Steps: add a pointer to the associated Song. not used yet.
2013-01-20 18:11:17 -05:00
Devin J. Pohly
da1ebd50ed
remove unused TimingData variable
2013-01-23 14:25:10 -05:00
Devin J. Pohly
9fd6768f49
TimingData: fix constness on getters
2013-01-21 22:52:36 -05:00
Devin J. Pohly
2cf9262afc
merge OverlayInput into Input. overlay screens can still intercept input if they want.
2013-01-12 23:19:44 -05:00
Devin J. Pohly
9c9e2f995f
just call Input from OverlayInput
2013-01-12 23:08:38 -05:00
Devin J. Pohly
d13ac7e7a2
modify Input() on screens to return boolean
2013-01-12 22:48:38 -05:00
Devin J. Pohly
f58584c939
allow overlay screens to accept codes
2013-01-11 10:08:27 -05:00
Jason Felds
ada0c3cdd0
Restore storing to 6 decimals.
2013-01-06 21:15:36 -05:00
Jason Felds
7bc9295508
Expand to two decimals.
...
The reason is due to BPMSegments and their storing of BPS rather than BPM.
2013-01-06 21:12:28 -05:00
Jason Felds
15b99c5b41
Only display decimals as needed.
2013-01-06 21:11:51 -05:00
Jason Felds
b62c1509e0
ints should be reset to 0, not NULL.
...
I know it's a macro, but this is just begging
to be abused somehow.
2013-01-04 11:01:00 -05:00
Jason Felds
350c31102a
Merge
2013-01-03 23:01:49 -05:00
Jason Felds
af07e028a1
Hopefully fix routine bug.
2013-01-03 22:59:03 -05:00
Marcio Barrientos
b39137e1be
Stop the musicwheel when the optionslist is oppened, this fixes a bug when you call the optionslist using a custom code detector
...
Small fix in gamestate
2013-01-03 03:17:30 -06:00
Devin J. Pohly
a3491b5a61
fix typo on 3fb9163
2013-01-02 14:09:17 -05:00
Devin J. Pohly
9e6d161743
fix crash on double ES.
...
code should ensure that a call to SetCurrentSteps passes steps that match the
current StyleType
2013-01-02 14:07:03 -05:00
Flameshadowxeroshin
c5d566c641
forgot a semicolon
2013-01-02 10:49:20 -06:00
phantom
ec69c7769b
More Windows loading.
2013-01-02 17:46:21 +01:00
Flameshadowxeroshin
3fb91639b3
ScreenEdit: Fix crash on pressing certain buttons in record.
2013-01-02 10:38:11 -06:00
Devin J. Pohly
e7db656fa7
ScreenEdit: fix assertion when recording past selection
2013-01-02 10:56:34 -05:00
phantom
716d62de10
Fix Gtk icon.
2013-01-02 10:59:38 +01:00
Devin J. Pohly
d80af5bf42
fix assertion when multiple players press start simultaneously
2013-01-01 14:32:22 -05:00
phantom
d7cdc02db3
Fix windows?
2013-01-01 18:14:14 +01:00
phantom
5fa1e3d2a0
Splash should show up properly now.
2013-01-01 17:40:29 +01:00
Devin J. Pohly
f6410abd43
X11: release all keys/buttons when window loses focus
2012-12-31 22:15:49 -05:00
Devin J. Pohly
655af974a6
simplify window mapping loop
2012-12-31 21:27:16 -05:00
Devin J. Pohly
d9f61d919c
answer some commented questions
2012-12-31 19:31:38 -05:00
Devin J. Pohly
301bc1428b
allow custom everything in user profile directory
2012-12-30 16:48:17 -05:00
Colby Klein
f4ac89c3c2
Same mouse input eating fix from ScreenSelectMusic.
2012-12-28 23:23:56 -08:00
Flameshadowxeroshin
2ccb66ff8d
arrrgh
2012-12-28 21:10:48 -06:00
Flameshadowxeroshin
f8e26cf2aa
update version info
2012-12-28 21:09:39 -06:00
Colby Klein
6bf3c9ed37
Fix mouse events being eaten on SSMusic.
2012-12-28 17:49:53 -08:00
Flameshadowxeroshin
49b029c3dd
try to fix ES double crash
2012-12-28 19:46:53 -06:00
Colby Klein
1d41b4a921
Add Lua hook for WheelBase:Move. Useful for Mouse support/messing with people.
2012-12-28 17:02:49 -08:00
Colby Klein
13c795d019
Revert "dummy out internal scoring"
...
This reverts commit e1b2222336 .
This is pretty much guaranteed to muck with themes.
2012-12-28 13:41:41 -08:00
Devin J. Pohly
b03b3adf41
remove extra zeros from editor textentry
2012-12-28 16:18:21 -05:00
Flameshadowxeroshin
e1b2222336
dummy out internal scoring
2012-12-28 11:22:47 -06:00
Colby Klein
f94302c02a
Fix line endings.
2012-12-27 19:01:26 -08:00
Jason Felds
f8865e8de3
Revert "fix file/line numbers in ASSERT_M/FAIL_M"
...
This reverts commit 376056a0cf .
Time to test before sending up.
2012-12-27 21:38:42 -05:00