Commit Graph

34529 Commits

Author SHA1 Message Date
Colby Klein 507a6cd5dd Merge pull request #455 from djpohly/iidx-wheel-sections
Allow OnlyShowActiveSection wheel to include current section title
2015-02-03 20:48:49 -08:00
Kyzentun c76b40ae99 Changed ScreenSyncOverlay to not stick off screen. 2015-02-02 10:31:12 -07:00
Kyzentun 989ea5d862 Added script function for finding what needs to be translated. 2015-02-02 09:19:51 -07:00
freem 131b7eac94 Merge branch 'master' of github.com:stepmania/stepmania 2015-02-01 23:24:54 -06:00
freem 2d4c431c3e 32-bit verinc.exe; I don't know what you guys were thinking 2015-02-01 23:24:31 -06:00
Kyzentun 5a7199d8fe EditRecordModeLeadIn translations from Jarosław Pietras. 2015-02-01 09:35:16 -07:00
Devin J. Pohly 603b9d95fc Allow OnlyShowActiveSection wheel to include current section title
IIDX hides inactive sections, but unlike the current behavior of our
OnlyShowActiveSection metric (based on certain Pumps according to
DaisukeMaster's comment), it retains the section title so that the
section can be closed normally.

New metric: MusicWheel.HideActiveSectionTitle, defaulting to true in
_fallback.  A bit unfortunate, but keeps backward compatibility with the
existing behavior of OnlyShowActiveSection.

If neither metric is true, wheel displays all titles plus the contents
of the active section (if any).

If OSAS is true but HAST is false, wheel displays the active section
title plus its contents, or all titles if no section is active.

If both are true, wheel displays only the active section's contents, or
all titles if no section is active.
2015-02-01 10:09:59 -05:00
Devin J. Pohly 156259d6fb Merge pull request #452 from djpohly/hide-inactive-section-fix
Fix CloseCurrentFolder with OnlyShowActiveSection
2015-02-01 09:59:39 -05:00
Kyzentun c7ffbb3453 Lead in time before recording starts in edit mode is now a preference. 2015-01-31 14:03:30 -07:00
Kyzentun e321a25ff0 Merge pull request #453 from djpohly/travis-install-step
Travis: add apt-get update and -y to dependency installation
2015-01-31 09:35:46 -07:00
Jason Felds 39c7e1bb45 Cleaner approach. 2015-01-31 11:14:56 -05:00
Devin J. Pohly d5a1a858b6 add apt-get update and -y to dependency installation
Recommended by Travis docs:

http://docs.travis-ci.com/user/installing-dependencies/

We may eventually want to look into whether the before_install/install
hooks are supposed to be used for this rather than before_script.
2015-01-31 11:11:26 -05:00
Devin J. Pohly f18fa45495 MusicWheel: fix CloseCurrentFolder with OnlyShowActiveSection
Moves all of the wheel-entry-hiding logic into SetOpenSection rather
than prematurely throwing out section headings.  Now when we close the
active section with OnlyShowActiveSection in effect, the headings are
shown rather than an empty wheel.
2015-01-31 10:38:14 -05:00
Devin J. Pohly 7f55c82846 toggling wheel sections should not end screen 2015-01-31 10:38:14 -05:00
Kyzentun 8cde91eb2e Prevent crashes from an invalid noteskin being set. 2015-01-31 00:23:54 -07:00
Kyzentun 09eede311c LOG->Info takes a char*, not an RString. 2015-01-30 23:41:59 -07:00
Kyzentun 86410a0570 Lazy update to ReceptorArrowRow so that ScreenNameEntry will work again. 2015-01-30 21:22:04 -07:00
Kyzentun b6e6185156 LoadTransformedSlidingWindow and LoadOverlapped now strip the PlayerNumber of each tapnote to PLAYER_INVALID so that NoteDisplay doesn't crash during rendering a single chart that was autogenned from a couple chart. 2015-01-30 10:05:15 -07:00
Ben "root" Anderson 615d4e6ef6 That shit was deprecated back in Windows XP! Service pack nothing, I'm talking RELEASE DAY. 2015-01-29 15:29:33 -06:00
Ben "root" Anderson 8b846cde08 Merge branch 'master' of github.com:stepmania/stepmania 2015-01-29 15:27:41 -06:00
Ben "root" Anderson 07defa4379 On closer inspection, this shouldn't be changed until 5.1. 2015-01-29 15:17:26 -06:00
Kyzentun 110d958558 Updated default theme Polish translation from Jarosław Pietras. 2015-01-29 13:17:50 -07:00
Jason Felds 0a4902c648 ...and the Mac side. 2015-01-28 22:09:38 -05:00
Jason Felds 890e19f16d Merge branch 'master' of github.com:stepmania/stepmania 2015-01-28 21:46:29 -05:00
Jason Felds a7fc46829e Don't force the old SDK. 2015-01-28 21:46:13 -05:00
Jason Felds 7a6db33644 Adapt to recent version_num changes.
...I don't get what's going on either.
2015-01-28 21:45:23 -05:00
Ben "root" Anderson 9c52fb659b I have no idea why I did that. I shouldn't have done that. 2015-01-28 20:09:19 -06:00
Ben "root" Anderson da49c509dd I accidentally a file 2015-01-28 20:05:34 -06:00
Ben "root" Anderson 8586f39a9c Merge branch 'master' of github.com:stepmania/stepmania 2015-01-28 19:22:44 -06:00
Ben "root" Anderson 7a33b8a44a Program version is now in a const from a generated file, not a static macro. Plus all the mess I had to make to get that to work. 2015-01-28 19:21:24 -06:00
Jason Felds 29f77a4b0e Merge pull request #98 from wolfman2000/wolf-json-library
Finish the library job properly: JSON moved in VS2012.
2015-01-28 19:49:51 -05:00
Ben "root" Anderson 0d394e269d Declare version_* in only one place. Define them in ver.cpp (at least on autotools). 2015-01-28 16:45:19 -06:00
Ben "root" Anderson a733560e62 I assume this was a typo 2015-01-28 16:00:13 -06:00
Kyzentun 5959125e1d Merge pull request #418 from zardoru/master
Couple hack-fixes for BMS crashes.
Merging this.  If anyone has problems loading/playing BMS, I'll tell them to ask you for help.
2015-01-28 11:13:06 -07:00
Kyzentun 7687d5c8a1 Merge branch 'master' of https://github.com/Flameshadowxeroshin/stepmania 2015-01-28 09:52:53 -07:00
Flameshadowxeroshin e861318449 I didn't change everything that needed to change 2015-01-28 10:20:50 -06:00
Kyzentun 7443f76eab Polish installer translation from Jarosław Pietras. Removed duplicate IsRoutine function from Branches.lua. Fixed beat noteskin receptor to not set zero delay. Minor change to default's danger underlay to pass the pn when fetching style. 2015-01-28 08:52:52 -07:00
Kyzentun 58d3fd2b6f Fixed pump noteskin to not set zero delay on receptor sprites. Changed error messages from Sprite to give 1-indexed state numbers. 2015-01-28 07:53:55 -07:00
Ben "root" Anderson 0778e7b35e Merge branch 'master' of github.com:stepmania/stepmania 2015-01-28 04:29:22 -06:00
Ben "root" Anderson 2dd245477f Automake needs a special fucking hint to notice generated source files 2015-01-28 04:27:56 -06:00
Ben "root" Anderson 5b61ea6e7d Merge branch 'master' of github.com:stepmania/stepmania 2015-01-27 23:59:22 -06:00
Ben "root" Anderson 2aed24ce46 At least the ffmpeg libraries get installed now... 2015-01-27 23:57:39 -06:00
Ben "root" Anderson 5f18a2aa4c In autoconf we trust (*snicker*) 2015-01-27 22:03:14 -06:00
Kyzentun bd3671ed2e Fixed operator= for PlayerOptions. 2015-01-27 21:02:24 -07:00
Kyzentun 5d616b244b Merge branch 'master' of https://github.com/stepmania/stepmania 2015-01-27 21:01:42 -07:00
Ben "root" Anderson fb6e75d308 Automatically generate PRODUCT_VER_BARE based on the current git revision 2015-01-27 21:53:31 -06:00
Ben "root" Anderson 05e620a854 Really actually regenerate ver.cpp every build 2015-01-27 21:17:39 -06:00
Ben "root" Anderson 3c235224db Update version in configure.ac. It's been forever. 2015-01-27 20:34:31 -06:00
Kyzentun 40b25e6220 Fixed conflicts to merge kickbox in. 2015-01-27 18:03:41 -07:00
Kyzentun cf66c5e78d Shuffle mod for kickbox. Noteskin from midiman. 2015-01-27 17:27:02 -07:00