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 |
|
Ben "root" Anderson
|
80a02b40bb
|
Don't hardcode -lrt
|
2015-01-27 17:05:49 -06:00 |
|
Ben "root" Anderson
|
465db6c4fe
|
Check whether a real librt is present and use it if necessary
|
2015-01-27 17:04:33 -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
|
4a5ad9114f
|
Merge pull request #442 from dguzek/XcodeUpdates
Xcode updates
|
2015-01-26 06:01:15 -07:00 |
|
Dan Guzek
|
a8c53abcc5
|
update minimum OS X version in Xcode project
We haven't supported anything older than 10.6.8 for quite a while now.
|
2015-01-26 07:50:44 -05:00 |
|
Dan Guzek
|
243bdacfcd
|
update Copyright dates in Xcode project
|
2015-01-26 07:33:38 -05:00 |
|
Kyzentun
|
47b00c0970
|
Fixed the rare bug where the life graph shows a gradual decline when it was actually full.
|
2015-01-26 00:46:47 -07:00 |
|
Flameshadowxeroshin
|
c02c3b1c13
|
Merge https://github.com/stepmania/stepmania
match upstream
|
2015-01-24 15:16:57 -06:00 |
|
Flameshadowxeroshin
|
06ee30d8b9
|
Kyzentun's milestone code
|
2015-01-23 21:30:06 -06:00 |
|
Flameshadowxeroshin
|
f8d8a3379f
|
improved checkpoint performance, one other change
|
2015-01-23 15:58:41 -06:00 |
|
Kyzentun
|
cd3dd03149
|
Changed RageBezier2D EvaluateYFromX to only loop 100 times instead of forever.
|
2015-01-23 10:41:39 -07:00 |
|
Flameshadowxeroshin
|
f230729a6f
|
unsigned int combo and score, Player::IncrementComboOrMissCombo
|
2015-01-23 10:25:06 -06:00 |
|
Ben "root" Anderson
|
1a62b6bd70
|
I forgot how to delete files in git
|
2015-01-22 21:46:35 -06:00 |
|
Ben "root" Anderson
|
d05043f5e6
|
Let's not bundle yasm because we never actually did. Use system yasm. I'll update the docs shortly.
|
2015-01-22 21:44:04 -06:00 |
|
Kyzentun
|
b6e9d188c3
|
Added special case to JoinPlayer's style changing logic, see comment in code. Fixed mistake in hold logic that made holds never drop.
|
2015-01-22 12:37:48 -07:00 |
|
Kyzentun
|
8ffebb9612
|
Syaoran creates a magical template for clamping the range of numbers.
|
2015-01-21 17:59:42 -07:00 |
|
Kyzentun
|
fb0b48be52
|
Changed screen width calculations to subtract 1 if the result is odd.
|
2015-01-21 10:44:16 -07:00 |
|
Kyzentun
|
d28c8a8ab1
|
#420 fixed by centering menu. #371 fixed by setting max height of text. #374 fixed by changing ItemsEndX
|
2015-01-21 10:13:56 -07:00 |
|
Kyzentun
|
b09fc11210
|
Fixed routine notefield not being centered correctly. Hid couple-edit and threepanel styles because they don't seem intended to be playable.
|
2015-01-20 19:58:53 -07:00 |
|
Kyzentun
|
aeaead95c9
|
Changed default ScreenSelecStyle to use functions for choice names and positions instead of metrics. _fallback SSS remains the same for compatibility. Fixed style stomping bug in SetCompatibleStylesForPlayers.
|
2015-01-20 18:40:59 -07:00 |
|
Kyzentun
|
daba6f19bb
|
Fixed t value calculation in AMV:SetVertsFromSplines.
|
2015-01-20 12:38:31 -07:00 |
|