Commit Graph
100 Commits
Author SHA1 Message Date
Jason Felds f61faa36b6 Fix typo in configure.ac 2015-03-09 20:55:19 -04:00
Jason Felds 1b58113f8d Merge pull request #496 from stepmania/revert-494-improved_notes_loader
Revert "Improved NotesLoaderSSC and NotesLoaderSM"
2015-03-09 16:59:16 -04:00
Jason Felds 519ad8672d Revert "Improved NotesLoaderSSC and NotesLoaderSM" 2015-03-09 16:58:56 -04:00
Jason Felds ba5a524738 Merge pull request #494 from kyzentun/improved_notes_loader
Improved NotesLoaderSSC and NotesLoaderSM
2015-03-09 16:57:00 -04:00
Jason Felds 39c7e1bb45 Cleaner approach. 2015-01-31 11:14:56 -05: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
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
Jason Felds 96ff284fd4 Merge pull request #436 from wolfman2000/wolf-ignore-dia
Ignore generated .dia files?
2015-01-18 14:03:39 -05:00
Jason Felds a3343a02c5 Ignore generated .dia files?
May have been from cmake testing.
2015-01-18 14:02:40 -05:00
Jason Felds 38a98b0964 Merge pull request #358 from jberney/master
Band-aid fix for Mac OS X fullscreen issues (only when compiled with 10.6 SDK)
2014-11-26 20:52:36 -05:00
Jason Felds 3451b2f2d5 Use operator overloading best practices.
Not all files covered.

Refer to StackOverflow for details: http://stackoverflow.com/a/4421719
2014-11-26 14:51:21 -05:00
Jason Felds 395107d3d5 Revert "Preserve Steps of unknown Style."
This reverts commit 8edd929e24.

This also updates the song cache.
2014-10-19 10:06:40 -04:00
Jason Felds a09e3477b2 Add another .gitignore entry: linker files. 2014-10-16 18:42:56 -04:00
Jason Felds 3c80f38b56 Typo. 2014-10-15 21:10:31 -04:00
Jason Felds 824b355fc2 Merge pull request #334 from wolfman2000/wolf-clean-gitignore
Clean up .gitignore. Organize by cateogry.
2014-10-15 20:46:56 -04:00
Jason Felds 45fe70c7d8 Clean up .gitignore. Organize by cateogry. 2014-10-15 20:11:54 -04:00
Jason Felds bf7344a3e1 Increment the version. Update the change log. 2014-10-15 18:42:00 -04:00
Jason Felds 578f0b8b0b Merge pull request #324 from jberney/master
Mac OS X 10.10 Yosemite crash fix
2014-10-13 18:54:05 -04:00
Jason Felds 295e09c9e6 Merge pull request #239 from dtinth/MacOSX10.9.sdk
Update to Mac OS X 10.10 SDK

Here's to hoping this doesn't cause too many problems.
2014-10-11 19:04:11 -04:00
Jason Felds 3fd3d22b3c Ignore user data in general. 2014-09-21 20:53:53 -04:00
Jason Felds 1cee5c0e68 Merge pull request #234 from dtinth/xcode5.1.1
Make StepMania compile in Xcode 5.1.1
2014-07-24 19:56:43 -04:00
Jason Felds e23ea4261b Merge pull request #193 from sigatrev/Dark
Fix dark float
2014-06-15 00:46:59 -04:00
Jason Felds acdb296276 Set up ActorMultiVertex for other VS projects. 2014-06-15 00:44:05 -04:00
Jason Felds 9738ba9b20 Move JSON to separate project (2011) 2014-03-21 21:22:25 -04:00
Jason Felds 0b1de9ba87 Correct my mistake from 83df0ad3d6.
...3+ years too late!

This should compile in all systems due to NotesLoaderJson inclusion.
2014-03-21 21:11:19 -04:00
Jason Felds 37f6b99571 Merge pull request #95 from wolfman2000/wolf-libraries
Separate out VS2012 projects appropriately.
2014-03-16 19:20:00 -04:00
Jason Felds 9912c51e88 Move LUA to separate project (2011) 2014-03-16 14:03:02 -04:00
Jason Felds c578ac69d4 Move GLEW to separate project (2011)
Note: glext.h was removed due to it not being used.
2014-03-16 13:09:07 -04:00
Jason Felds f4eca5cc78 Move PNG to separate project (2011) 2014-03-16 12:04:01 -04:00
Jason Felds 70f7d18b1b Move PCRE to separate project (2011) 2014-03-16 11:40:49 -04:00
Jason Felds 2a360fb8f2 Update the hardware...I think?
Need another Mac user to verify.
2014-03-07 22:26:06 -05:00
Jason Felds 8151afc602 Merge pull request #41 from kyzentun/resetspeed_mod
Added resetspeed mod to PlayerOptions.
2014-02-15 09:51:44 -05:00
Jason Felds 6d51648bbf Merge pull request #46 from kyzentun/PlayMusicPart_loopable
Made SOUND:PlayMusicPart pass on the loop and applyRate args.
2014-02-14 20:56:27 -05:00
Jason Felds 875d6bd48b Merge pull request #45 from kyzentun/SetAllowLateJoin
Added SetAllowLateJoin to ScreenWithMenuElements.
2014-02-14 19:21:41 -05:00
Jason Felds 5db9840dd8 Merge pull request #43 from kyzentun/expose_joininput
Exposing GameState::JoinInput to Lua.
2014-02-14 19:19:48 -05:00
Jason Felds 6cfedbc7f3 Merge pull request #39 from kyzentun/miscounted_hold_points
Hold notes were added to possible score twice.
2014-02-14 19:13:47 -05:00
Jason Felds 3adfce9857 Merge pull request #37 from kyzentun/ComboGraph_height_fix
ComboGraph height fix
2014-02-13 21:32:21 -05:00
Jason Felds 9bbefe2240 Attempt prep work for 64 bit just in case.
If SDL2 fails, someone (not me) will have to try to
keep these updated.
2014-02-12 19:40:27 -05:00
Jason Felds 3f1c96d10f Merge pull request #38 from kyzentun/misleading_style_comment
Comment in Style.h was misleading.
2014-02-12 17:02:38 -05:00
Jason Felds c5637444ab Attempt preventative file not found crashing. 2014-02-04 21:10:40 -05:00
Jason Felds e82f2cfa2c Attempt to warn about missing translations. 2014-02-03 21:18:04 -05:00
Jason Felds 1f58900f4f Merge pull request #24 from wolfman2000/wolf-tab-fix
...seriously? Xcode setting fix for tabs?

...sometimes I don't get these editors.
2014-02-03 17:58:39 -08:00
Jason Felds 65f0261292 ...seriously? Xcode setting fix for tabs? 2014-02-03 20:57:17 -05:00
Jason Felds e6125e6daa Attempt to allow getting radar values without PN. 2014-02-03 18:49:17 -05:00
Jason Felds 20dc9af218 Missed this from last time. 2014-02-03 18:35:38 -05:00
Jason Felds c4f8a9d834 Merge pull request #19 from wolfman2000/wolf-unified-xcode4
Fix Xcode 4 building, bring it back to one file.

dbk2 approves. Calling it as good then. If mistaken, make a new branch and prove it.
2014-02-01 20:34:23 -08:00
Jason Felds 2fe6144ea5 Prevent swap files from being added. 2014-02-01 23:08:34 -05:00
Jason Felds 264013aa58 Remove multiple duplicate entries. 2014-02-01 23:06:14 -05:00
Jason Felds 8e0ba01385 Ignore Xcode user specific files. 2014-02-01 22:49:23 -05:00
Jason Felds ae5af084e5 Unify into one 4.6.3 xcodeproj file. 2014-02-01 22:47:55 -05:00
Jason Felds 7ec8de6007 Fix vorbis first of all. 2014-02-01 22:34:16 -05:00
Jason Felds 4919b7c28f Attempt to address issue #9 for SM5.
Not in best position to test out.
2014-01-29 18:12:10 -05:00
Jason Felds 938e3ba01d Ignore sublime text projects/workspaces. 2014-01-29 17:52:19 -05:00
Jason Felds 3b9b4d1e36 Issue 010: Add missing step sync types. 2014-01-27 19:38:41 -05:00
Jason Felds 09f8219a67 Revert "Xcode 5 fixing, part 1."
This reverts commit bfab952b6a.
2013-11-06 23:33:31 -05:00
Jason Felds bfab952b6a Xcode 5 fixing, part 1.
Need someone on xcode 4.x to confirm this works.

Once this file gets fixed, the others will be removed.
2013-11-04 19:45:23 -05:00
Jason Felds 702f091ea1 Remove outdated SM_ALIGN macro. 2013-10-18 18:39:25 -04:00
Jason Felds 4f0dc3e832 CatWEax is right: fix up alignment.
Hoping I fixed it the right way.
2013-09-23 21:06:33 -04:00
Jason Felds ef1190e3db Revert "Handle noteskin lua. Thanks to Jousway."
This reverts commit 1532c4e5ab.
2013-07-18 18:02:18 -04:00
Jason Felds fb5db73c45 Revert "DONE! All lua is future-proofed."
This reverts commit afd0dac0c1.
2013-07-18 18:02:01 -04:00
Jason Felds ea45a6947c Revert "Some more of default. Not yet done."
This reverts commit 162b626e3e.
2013-07-18 17:57:14 -04:00
Jason Felds dc5d6a932d Revert "Some of default. Better break this up."
This reverts commit 8833ab5bc6.
2013-07-18 17:43:31 -04:00
Jason Felds 6120a8a5e4 Revert "Fallback handled. Yes, I tested this."
This reverts commit 986d510a88.
2013-07-18 17:43:19 -04:00
Jason Felds 881f175e6c Revert "Themekit for PIU handled."
This reverts commit 91611d3624.
2013-07-18 17:43:01 -04:00
Jason Felds 450936e414 Revert "HelloWorld theme handled."
This reverts commit e805184fd0.
2013-07-18 17:42:49 -04:00
Jason Felds c872bb311c Revert "The "new" theme is handled."
This reverts commit 2d5d45e365.
2013-07-18 17:42:22 -04:00
Jason Felds f57abda0bc Revert "Portkit for SM4 handled."
This reverts commit f373dd9add.
2013-07-18 17:42:11 -04:00
Jason Felds e495af010c Revert "Themekit handled."
This reverts commit 9982e3369e.
2013-07-18 17:42:01 -04:00
Jason Felds 7f2fb952ca Revert "MouseTest theme covered."
This reverts commit ca1b8cb942.
2013-07-18 17:41:35 -04:00
Jason Felds f5c5648bdd Revert "RSR theme covered."
This reverts commit c31d1f1c9d.
2013-07-18 17:41:24 -04:00
Jason Felds da657870d4 Revert "More lua."
This reverts commit 2330c87501.
2013-07-18 17:41:10 -04:00
Jason Felds fbf979e93b Revert "More lua to fix."
This reverts commit d20290ad2f.
2013-07-18 17:41:00 -04:00
Jason Felds 53069a73eb Revert "Time to migrate back to stock lua."
This reverts commit 5a5724d13f.
2013-07-18 17:40:47 -04:00
Jason Felds ef37e0036d Don't require Mac OS X 10.6 SDK. 2013-07-10 21:03:21 -04:00
Jason Felds b72b4a2036 Remove unused declaration. Thanks to vulture. 2013-07-07 18:50:30 -04:00
Jason Felds 1532c4e5ab Handle noteskin lua. Thanks to Jousway. 2013-07-06 21:51:12 -04:00
Jason Felds afd0dac0c1 DONE! All lua is future-proofed. 2013-07-05 22:17:42 -04:00
Jason Felds 0259af5c80 Prevent possible crash noticed during testing. 2013-07-04 22:54:38 -04:00
Jason Felds 162b626e3e Some more of default. Not yet done. 2013-07-04 22:50:30 -04:00
Jason Felds 8833ab5bc6 Some of default. Better break this up. 2013-07-04 13:09:03 -04:00
Jason Felds 986d510a88 Fallback handled. Yes, I tested this. 2013-07-03 20:08:34 -04:00
Jason Felds a5ef44a838 More files to ignore. 2013-07-03 18:40:16 -04:00
Jason Felds 91611d3624 Themekit for PIU handled. 2013-07-03 18:38:57 -04:00
Jason Felds e805184fd0 HelloWorld theme handled. 2013-07-02 20:28:29 -04:00
Jason Felds 2d5d45e365 The "new" theme is handled. 2013-07-02 18:22:43 -04:00
Jason Felds f373dd9add Portkit for SM4 handled. 2013-07-02 17:48:24 -04:00
Jason Felds 9982e3369e Themekit handled.
...yeah, I can't replicate the IFFE in pure lua.
2013-07-01 22:08:27 -04:00
Jason Felds ca1b8cb942 MouseTest theme covered. 2013-07-01 21:41:29 -04:00
Jason Felds c31d1f1c9d RSR theme covered. 2013-07-01 21:30:10 -04:00
Jason Felds 2330c87501 More lua. 2013-07-01 21:09:06 -04:00
Jason Felds d20290ad2f More lua to fix. 2013-07-01 21:00:52 -04:00
Jason Felds 5a5724d13f Time to migrate back to stock lua.
Sorry for the newline mess.
2013-07-01 20:25:37 -04:00
Jason Felds af55e84525 A band-aid until we figure out redist stuff. 2013-06-16 12:55:13 -04:00
Jason Felds 78ff471d0b Use the 100 files now that the others are gone. 2013-06-15 21:36:03 -04:00
Jason Felds 4c99830ce4 Version update, windows notes, LINE ENDINGS!
...I'm serious getting annoyed at this.
2013-06-15 21:09:23 -04:00
Jason Felds 8d50a47d49 Require using the string format stuff.
Fixes a linux compilation bug.
2013-06-09 11:15:28 -04:00
Jason Felds d6441690b4 Fix keysound editor crash. 2013-06-09 09:08:53 -04:00