actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,702 Commits 3 Branches 0 Tags
c49d78f5fc82bcf21d2fe456db2ab2b89539dad2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Felds c49d78f5fc Linux CMake improvements: 
* Disable warning output during configuration.
* Allow users to turn on warnings for ffmpeg and other internal projects.
* Add a new variable for easier ffmpeg version migration if we ever
* pursue that.
 2015-04-05 14:49:10 -04:00
Jason Felds 0954c81846 Merge pull request #545 from Wallacoloo/master 
Fix OSX key translation crash (#504)
 2015-04-05 09:26:58 -04:00
Jason Felds 016a4053e1 More CMake improvements and education. 
* `set_target_properties` can have multiple properties assigned in one go.
* Have version information be generated from CMake, not later plist preprocessing.
* Configure the plist file regardless of OS. This should be a safe command: following the example from the knut repository.

The old fashioned Info-StepMania.plist file can be considered deprecated
upon a full migration to CMake.
 2015-04-03 23:24:46 -04:00
Jason Felds 6b4c4e298f Restore compilation for non cmake users. 
The goal is to move to cmake fully. Dealing with plist issues,
specifically on the version.
 2015-04-03 16:04:48 -04:00
Jason Felds b3addbedbc CMake adjusted to allow proper releasing. 
Mac side is ready.
 2015-03-31 21:17:20 -04:00
Jason Felds 2291cd7f4d We're going to 5.0.7. 2015-03-31 19:27:12 -04:00
Jason Felds bfc24455ae Merge pull request #529 from dguzek/OSX-Version-LogFix-v2 
OS X Version Log Fix -- v2
 2015-03-26 17:41:06 -04:00
Jason Felds 541389ea7d Resolve casting warning where no one would check. 2015-03-25 22:09:46 -04:00
Jason Felds 38cf1730db Merge pull request #528 from wolfman2000/wolf-cmake-ffmpeg-quick 
Don't have ffmpeg's download take forever.
 2015-03-24 21:27:56 -04:00
Jason Felds 8993ce7fa8 Important fixes to this branch: 
* Don't download the repo again if it exists.
* Remember the include directories.
 2015-03-24 20:04:48 -04:00
Jason Felds 6963e4d493 Don't have ffmpeg's download take forever. 
Thanks for the assist teleshoes.
 2015-03-24 19:12:28 -04:00
Jason Felds 6e5b80fbfe Right: 2011/2012 compiles PNG. 2015-03-23 19:43:46 -04:00
Jason Felds 5d232aad75 Restore cmake-less 2011/2012 VS support. 
Move to cmake people!
 2015-03-23 19:41:39 -04:00
Jason Felds 0b312b1771 Merge pull request #524 from wolfman2000/wolf-vs-2013-fix 
Fix compilation for cmake-less 2013 users.
 2015-03-23 18:55:38 -04:00
Jason Felds 0a1f43dcbe Fix compilation for cmake-less 2013 users. 
This should compliment 7ac547a5.
 2015-03-23 18:54:58 -04:00
Jason Felds b66b9143dc Make it clearer for build types. 2015-03-22 17:08:54 -04:00
Jason Felds 05d341485d Allow for system ffmpeg usage. 
Warning: this is NOT advised right now.
 2015-03-22 16:03:38 -04:00
Jason Felds 33f183938e Allow for system pcre to take precedence. 2015-03-22 15:46:53 -04:00
Jason Felds ecbec126af Allow disabling GPL only components. 
Only works for Linux right now.
 2015-03-22 15:24:20 -04:00
Jason Felds 736338dab6 Make sure product_version is set for OS X. 
This may go away when we move to cmake for good.
 2015-03-22 10:03:50 -04:00
Jason Felds dc94728628 Introduce cmake (min 2.8.12) to StepMania. 
tl-dr: view the Build directory to see.

This is intended to replace the project files that we presently maintain
so that only a single set is needed instead of multiples.

The following setups were used for testing:

* Windows 8 and Visual Studio 2013 Desktop Express
* Windows 7 and Visual Studio 2012
* Mac OS X Mavericks and Xcode
* Ubuntu and makefiles
* Fedora 21 and makefiles

All three operating systems can generate projects, compile, link, and
run. Windows and Mac OS X users will find their compiled binary in the
same location as before, but Linux users will be surprised: it goes
straight into the root directory, along with a symlinked GtkModules.so
as appropriate. There is no more need for a manual symlinking step.

Known issues:

* At this time, MinGW likely does not work. Extra time will be needed.
* The WITH_JPEG option may go away, and we'll just always require it.
* Some linux libraries can use the system equivalents, but that is not up yet.

For more information, check out the Build directory.
 2015-03-21 20:15:15 -04:00
Jason Felds 3e965152c9 Remove unused function. 
Is there really a point for us to have this?
 2015-03-15 11:46:07 -04:00
Jason Felds f584640f8a Restore --without-network. 2015-03-10 17:56:16 -04:00
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