Commit Graph

4132 Commits

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 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 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 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
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
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
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
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 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
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 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
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
Kyzentun 9353840583 Added HarshHotLifePenalty preference. 2015-03-08 23:44:18 -06:00
Kyzentun 3c9452d894 Rewrote IniFile::ReadFile to use a switch and cache the section node. Rewrote StringToTapNoteScore to use a map. 2015-03-08 22:38:00 -06:00
Kyzentun d617321766 Emit an error for negative tweening hurry factor. 2015-03-08 10:12:42 -06:00
Kyzentun d3367d6a16 Add prompt for clearing an area in Edit Mode. Updated changelog. 2015-03-08 00:56:29 -07:00
Kyzentun 976f773f7c Merge pull request #486 from kyzentun/mute_actions
Toggle key for muting actions
2015-03-07 17:51:28 -07:00
Kyzentun e22ae52ba4 Merge pull request #485 from kyzentun/font_errors
Non-fatal font errors.
2015-03-06 17:35:22 -07:00
Kyzentun ff520479ca Rewrote NotesLoaderSM and NotesLoaderSSC to use map instead of an else if chain. Substantial improvement to load time. 2015-03-05 20:32:08 -07:00
Kyzentun 4fd79b212e Merge pull request #492 from kyzentun/use_cached_length
Use cached song length.
2015-03-05 20:20:23 -07:00
poly 5542d66e82 [DX9] Use hardware vertex processing rather than software. This gives a large speed boost, so unless there is a timing issue I don't see why this shouldn't be used. 2015-03-05 01:29:32 -08:00
poly 36f5c9ad45 [DX9] Push 32bit back buffer formats first, so windowed users don't get stuck using the first valid 16bit format. 2015-03-05 01:27:38 -08:00
Kyzentun 05fb09323e Changed decorations layer back to being a frame that is stripped of its actors. According to ancient commit logs, it was like that to allow controlling the draworder of decorations relative to other screen children. 2015-03-04 21:24:33 -07:00
Kyzentun ebb79d0ea6 Use cached song length instead of hitting the disk to read the music file. 2015-03-04 18:54:57 -07:00
Kyzentun 46d215aed3 Added preview tag to NotesLoaderBMS. Changed Song to check the preview file for sample length instead of the simfile if the preview file is set. 2015-03-04 13:10:51 -07:00
Kyzentun 0318f07d2d Implement preview music properly as a new optional tag in the ssc file. Changed ScreenManager to emit an error instead of asserting if a screen attempts to use SetNewScreen inside an InitCommand. Changed decorations layer to be a proper child instead of stripping away the ActorFrame. 2015-03-04 01:31:02 -07:00
Kyzentun fc8da6b485 Update file cache version. 2015-03-02 19:01:17 -07:00