Commit Graph
46 Commits
Author SHA1 Message Date
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
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 79583090ac guess this is a theme-facing feature. update changelog. 2013-01-12 10:43:33 -05:00
Devin J. Pohly f58584c939 allow overlay screens to accept codes 2013-01-11 10:08:27 -05:00
Devin J. Pohly 4a3e3370d8 make-src-archive: overwrite symlinks in autoconf/ if needed 2013-01-10 16:39:03 -05: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
Devin J. Pohly e7db656fa7 ScreenEdit: fix assertion when recording past selection 2013-01-02 10:56:34 -05:00
Devin J. Pohly d80af5bf42 fix assertion when multiple players press start simultaneously 2013-01-01 14:32:22 -05: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
Devin J. Pohly 226877f826 remove some apparently accidentally-added files 2012-12-30 13:03:55 -05:00
Devin J. Pohly b03b3adf41 remove extra zeros from editor textentry 2012-12-28 16:18:21 -05:00
Devin J. Pohly bd0e2074ad replace ASSERT(0) with useful fail messages 2012-12-27 16:59:35 -05:00
Devin J. Pohly 376056a0cf fix file/line numbers in ASSERT_M/FAIL_M 2012-12-27 13:52:49 -05:00
Devin J. Pohly 7f4e97d72a fix one more unused warning 2012-12-26 23:08:51 -05:00
Devin J. Pohly 1acbf07466 war on -Werror, part 4: miscellany 2012-12-26 21:45:45 -05:00
Devin J. Pohly 58aa480016 war on -Werror, part 3: narrowing conversions 2012-12-26 21:12:12 -05:00
Devin J. Pohly 7aac8c5ae3 war on -Werror, part 2: unused variables and dead code 2012-12-26 20:35:02 -05:00
Devin J. Pohly 1f80e3be4c remove code in ScreenGameplay that doesn't do anything 2012-12-26 20:15:56 -05:00
Devin J. Pohly d45afb73d8 war on -Werror, part 1: constructor order, c++ actually cares 2012-12-26 20:14:40 -05:00
Devin J. Pohly 07aa41e6ef add comments to clarify piuio inputdriver 2012-08-12 23:13:34 -04:00
Devin J. Pohly a6bdf6c741 add a couple of file patterns I missed, and make names consistent. 2012-08-12 19:24:15 -04:00
Devin J. Pohly 92f2a16557 new make-src-archive. old one was old. 2012-08-12 19:05:28 -04:00
Devin J. Pohly daa8b6faea move random src/docs folder (1 file) to Docs/Devdocs instead 2012-08-10 17:16:14 -04:00
Devin J. Pohly e0ed921357 silence Lua warning about nonexistent global `Scoring'
probably overlooked in commit bffa610
2012-08-06 00:12:23 -04:00
Devin J. Pohly 1fb39f6524 merge head blendtypo 2012-08-05 23:33:22 -04:00
Devin J. Pohly 71222c006e fix detection of ffmpeg 0.11.1 2012-08-02 16:47:29 -04:00
Devin J. Pohly 92c7a7389c replace deprecated functions to fix build on ffmpeg 0.11.1
tested on static 0.10.2 as well and it works just fine.
2012-08-02 17:38:08 -04:00
Devin J. Pohly aa3244a0f2 fix typo in blend functions 2012-07-31 23:26:50 -04:00
Devin J. Pohly 80057f53cd smsvn -> ssc-hg glue: rearrange directory structure 2013-06-10 15:38:43 -04:00