Kyzentun
138077db67
Merge branch 'with-system-pcre' of https://github.com/Tatsh/stepmania
2015-02-05 00:47:25 -07:00
Kyzentun
ad877b6dcb
Changed BackgroundEffects files to apply the playback rate to videos. Added GetUpdateRate to ActorFrame and Get/SetDecodeMovie to Sprite. Hope nobody is caught off guard by checkerboard no longer playing videos back at 4x rate.
2015-02-05 00:37:08 -07:00
Kyzentun
72aa6c6164
Changelogged the unconflict.
2015-02-04 19:30:05 -07:00
Kyzentun
72ec78ec11
Unconflicted changelog.
2015-02-04 19:27:50 -07:00
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
c400794d50
Added ForceStateUpdate and SetDecodeMovie to AMV. Fixed SetStateProperties and SetQuadState off by one errors. Added size lua functions to RageTexture. Added GetBGChanges to Song.
2015-02-02 23:28:33 -07:00
Kyzentun
c76b40ae99
Changed ScreenSyncOverlay to not stick off screen.
2015-02-02 10:31:12 -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
6570db599c
AMV animation state system added.
2015-02-01 17:01:15 -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
Jason Felds
39c7e1bb45
Cleaner approach.
2015-01-31 11:14:56 -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
Kyzentun
b4ede3f977
Stupid LuaHelpes::Push doesn't have a size_t specialization.
2015-01-30 09:30:50 -07:00
Kyzentun
647b361284
Added wrapper states to actors. Wrapping an actor inside a frame when building a screen is now unnecessary.
2015-01-30 09:05:09 -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
07defa4379
On closer inspection, this shouldn't be changed until 5.1.
2015-01-29 15:17:26 -06:00
Jason Felds
0a4902c648
...and the Mac side.
2015-01-28 22:09:38 -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
Andrew Udvare
36a412f6e4
Add --with-system-pcre; allow building against system PCRE library
2015-01-28 16:11:26 -08: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
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
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
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
Ben "root" Anderson
80a02b40bb
Don't hardcode -lrt
2015-01-27 17:05:49 -06:00
Kyzentun
c586db8f5d
Added -lrt to AM_CXXFLAGS in src/Makefile.am. Why isn't autoconf detecting this dependency? Added Jarosław Pietras to list of translators. in credits.
2015-01-27 14:36:22 -07:00
Kyzentun
c69cf1ef4e
Special case kickbox autogen added. GameState now has a member for passing args from the theme to the autogen, only used by kickbox for kick recovery time.
2015-01-26 19:43:15 -07:00
Kyzentun
43255b2238
Force players to be on selectable choices on ScreenSelectMaster when updating which choices are selectable.
2015-01-26 07:49:12 -07:00
Kyzentun