actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
34,671 Commits 3 Branches 0 Tags
8993ce7fa8e8f0051640bee2a4304d408b34d922
Commit Graph
34671 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
freem b9551cc392 vs2010 project is back to where it was before cmake 
(that is to say, still messes up during the mapconv portion, but doesn't have any linking errors anymore)
 2015-03-23 18:47:47 -05: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
freem 2d59abc9ce fix vs2008 build 2015-03-23 17:58:06 -05: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
Ben "root" Anderson 1a0e1a0b91 Simpler, more robust ver.cpp generation (also automated whitespace cleanup, lol) 2015-03-23 15:16:01 -05:00
freem 8e1cb42164 Merge branch 'master' of github.com:stepmania/stepmania 2015-03-22 21:35:32 -05:00
freem 7ac547a5ea recent cmake changes broke standalone windows building. argh. 
This commit does not fix it, but it does get rid of the various lib errors it was throwing.
various linking errors remain
 2015-03-22 21:35:11 -05:00
Jason Felds b66b9143dc Make it clearer for build types. 2015-03-22 17:08:54 -04:00
Colby Klein ac211bb3c3 Merge pull request #519 from wolfman2000/wolf-cmake-fixes-shake 
Linux cmake improvements as suggested by @shakesoda.
 2015-03-22 13:22:57 -07: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
Colby Klein 27429d551f Merge pull request #518 from wolfman2000/wolf-cmake-squashed 
Introduce cmake (min 2.8.12) to StepMania.
 2015-03-21 18:10:45 -07: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
Kyzentun 63c709e9f2 Merge pull request #516 from sigatrev/AFT-crashes 
Prevent 2 AFT related crashes
 2015-03-21 00:55:35 -06:00
sigatrev 994b972d08 Prevent 2 AFT related crashes 
Attempting to create a texture of 0 size or a texture with a name that
is already in use would crash SM.
 2015-03-21 00:34:30 -05:00
AJ Kelly 05f455cc17 Merge pull request #515 from sigatrev/AFT-example-update 
Update AFT examples
 2015-03-19 22:06:17 -05:00
sigatrev c5451c98d5 Update AFT examples 
Added a note to example 3 specifying that it was demonstrating the
"float" property.

Added information about functionality I only just realized existed: the
ability to draw outside of the screen's draw cycle.
 2015-03-19 19:20:39 -05:00
Colby Klein 75949d3646 Merge pull request #512 from wolfman2000/wolf-product-idless 
Remove unused function.
 2015-03-18 21:47:07 -07:00
Colby Klein 0834e601ac Merge pull request #513 from sigatrev/ActorFrameTexture 
Actor frame texture
 2015-03-18 21:33:17 -07:00
Colby Klein cbd61605ad Merge pull request #481 from dguzek/OSX-Desktop-Dir 
prevent OS X Desktop directory from being created
 2015-03-18 21:29:49 -07:00
Colby Klein 0b1f888d10 Merge pull request #514 from Arvaneth/master 
French translation
 2015-03-18 21:00:29 -07:00
sigatrev 3af895b1bf AFT examples 
because it seem like I'm the only one who knows what these things do.
 2015-03-17 21:46:22 -05:00
sigatrev 45a0952a3b Prevent crash when AFT draws an AFT 
by remember the previous render target.
 2015-03-17 21:41:31 -05:00
sigatrev cc5c05a4f1 Fix AFT DepthBuffer 2015-03-17 21:37:26 -05:00
Kyzentun 833754289c Merged changelog conflicts. 2015-03-17 19:30:29 -06:00
Ben "root" Anderson 76d9ba6bf1 glFinish() to force the tightest input-to-screen coupling possible 2015-03-15 19:06:52 -05:00
Kyzentun 369368a019 Fixed loading of ssc format edit files. 2015-03-15 16:54:04 -06:00
Kyzentun 7be1a35d77 Fixed IniFile::RenameKey by adding RenameChildInByName to XmlFile. Only font loading uses RenameKey. 2015-03-15 13:23:23 -06: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
Kyzentun d85ac9af85 Added GetTexturePath lua function to Sprite. 2015-03-15 00:34:21 -06:00
Kyzentun d5b0b78ccf Added changelog for language strings. 2015-03-12 21:24:50 -06:00
Kyzentun 3140c4f30f Changed preview length setting to occur when the special preview file is set in edit mode. 2015-03-11 18:55:06 -06:00
AJ Kelly 0d309e633d Merge pull request #506 from wolfman2000/wolf-without-network 
Restore --without-network.
 2015-03-10 17:01:27 -05:00
Jason Felds f584640f8a Restore --without-network. 2015-03-10 17:56:16 -04:00
Kyzentun bd53ae2e81 Updated changelog for 5.0.7rc. 2015-03-09 20:54:55 -06:00
Kyzentun 98b0af2e27 Compile before committing, kids. 2015-03-09 20:45:28 -06:00
Kyzentun 20953df0bd Rebased loading optimizations to current master. 2015-03-09 20:42:33 -06:00
Kyzentun 25e4dc4edc Rebased autosave to current master. 2015-03-09 20:23:22 -06:00
Kyzentun ddb1683bb7 Autosave completed but not tested. 2015-03-09 19:47:44 -06:00
Kyzentun 064aead73c Added autosave to edit mode. 2015-03-09 19:47:43 -06:00
Kyzentun fa0478affa Merged per-chart music. Updated changelog. 2015-03-09 19:06:57 -06:00
Kyzentun 9b86f5ea44 Merge pull request #500 from wolfman2000/wolf-configure-typo 
Fix typo in configure.ac
 2015-03-09 18:59:30 -06: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