Commit Graph

4160 Commits

Author SHA1 Message Date
Kyzentun 88af6acdfd Merge pull request #552 from kyzentun/radar_note_count
RadarCategory_Notes, uncapping and fixes to radar calculation.
2015-04-06 22:49:42 -06:00
Kyzentun 1e668c660f Removed _t from typenames because of POSIX. Fixed bug that made a warp and stop on the same row skip the marker in TimingData. 2015-04-06 21:49:46 -06:00
Jason Felds 4374d18cb8 Merge pull request #544 from wolfman2000/wolf-cmake-dmg-generator
Allow generating dmg files thanks to cmake.
2015-04-06 22:58:53 -04:00
Kyzentun 5852067f47 Added RadarCategory_Notes. Rewrote NoteDataWithScoring stuff to only traverse the NoteData once, and match the radar code in NoteDataUtil. Fixed hand and lift counting in NoteDataUtil::CalculateRadarValues. Removed cap from RadarValues so that Stream, Voltage, Air, Freeze, and Chaos can be over 1.0. Fixed Stream and Voltage to not count hold heads twice. Changed SetRadarValues in NotesLoaderSSC to not require the stepfile version number. 2015-04-06 18:45:23 -06:00
Colin Wallace 8ed944368c Fix OSX key translation crash (#504) 2015-04-05 02:55:54 +00:00
Jason Felds 01032b6049 Allow generating dmg files thanks to cmake.
A new target is introduced called `dmg`. This must be run explicitly.
Upon running it, it creates the dmg file.

The target respects if we are in a full release or not.

This will officially deprecate the ruby release script in the Xcode
folder upon a successful merge.
2015-04-04 15:23:28 -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
Kyzentun 2f1a348565 Commify handles negative numbers now. 2015-04-02 18:02:38 -06:00
Kyzentun d789ef7c6b Exposed commify function to lua and made it handle decimal numbers. 2015-04-02 13:36:41 -06:00
Jason Felds b3addbedbc CMake adjusted to allow proper releasing.
Mac side is ready.
2015-03-31 21:17:20 -04:00
Kyzentun 2b4cabfb57 Added keybinding for reloading songs on SSM, and lua function for doing it from lua. Added NeverCacheList preference for WIP groups that should never be cached. Rewrote TimingData::CopyRange in preparation for using it to copy/paste timing data from the selected area in edit mode. 2015-03-31 15:20:37 -06:00
Kyzentun 0e66d625e6 Merge pull request #534 from kyzentun/song_manager_restructure
Various changes to speed up start up time
2015-03-31 09:41:15 -06:00
Kyzentun e08182446e Fixed bug in TimingData lookup table for elapsed time. The entries were being added with the time for lookup when they should have been added with the beat. Also fixed the way GetElapsedTimeInternal uses FindEvent so that FindEvent won't spuriously find the marker when building the lookup table. 2015-03-30 22:41:40 -06:00
Kyzentun 8b09da8e64 Various changes to speed up start up time:
Added delay_save_cache to SongCacheIndex so that it doesn't write the entire cache index file after every song is loaded when loading songs.
Added m_SongsByDir to SongManager so that GetSongFromDir doesn't have to walk the entire list of songs.
Minor changes to when LoadEnabledSongsFromPref occurs and how SanityCheckGroupDir works to speed up loading.
Song::ReloadFromSongDir removes cache file to force an actual reload from the song dir instead of reloading from the cache.  ReloadFromSongDir exposed to lua.
Reordered Actor::LoadFromNode to put Command first because that case is more common.
Course::GetTrailUnsorted reserves entries before starting to save time reallocating.
join in RageUtil calculates the final size of the concatenated strings reserves it to save time reallocating.
Added time log file to RageLog for profiling.
2015-03-30 17:45:52 -06:00
Kyzentun 3c70b13fcf Fixed unitialized radar in CalculateRadarValues. Changed song deletion message to use translated string. Updated changelog. 2015-03-27 17:04:58 -06:00
Colin Wallace 473974e52f Add ability to delete songs from disk at the song selection screen (Ctrl+Backspace) 2015-03-27 05:22:55 +00:00
Dan Guzek e67c8e010a update CMake to use new ArchHooks_MacOSX.mm file
It is necessary to clear existing cmake cache and generate a new Xcode
project, following wolfman2000's instructions in ./Build/README.md

Witht that done, you can use the StepMania.xcodeproj generated by cmake
to successfully build a fresh StepMania.app and it properly logs the OS
X version.
2015-03-25 23:03:23 -04:00
Dan Guzek 2c16c6870c log OS X version properly - take 2
There was code in place to log the OS X kernel version (14.1.0, for
example) to log, but it stopped working some time ago. "Mac OS X
unknown." has been logged for the last several releases.

This commit swaps out that C++ code for a some Obj-C which logs the OS
X release version (10.10.2, for example) correctly. In order to mix
Obj-C with an otherwise C++ file, I changed the file extension from .cpp
to .mm to make it Objective-C++.

At the suggestion of wolfman2000, I have updated
src/CMakeData-arch.cmake to reflect the changes in this commit; that
will follow in the next commit from me.
2015-03-25 22:53:42 -04:00
Jason Felds 541389ea7d Resolve casting warning where no one would check. 2015-03-25 22:09:46 -04:00
Kyzentun 540c617485 Merge pull request #521 from kyzentun/load_only_from_cache
More aggressive caching.
2015-03-24 20:41:14 -06:00
Kyzentun 7ab01aa056 Merge pull request #510 from kyzentun/faster_timing_data
Faster TimingData lookups
2015-03-24 20:41:01 -06: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
Kyzentun 062b618bda Changed ActorFrame::SetUpdateRate to reject a negative rate instead of crashing. 2015-03-24 18:28:11 -06: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
Kyzentun f4da2988d9 Moved GetTexturePath lua function from Sprite to RageTexture and renamed it to GetPath. Updated changelog. 2015-03-24 14:23:30 -06:00
Kyzentun 31ce1c7b39 Moved more things to happen only when a song isn't cached. Song::TidyUpData now only fetches a list files in the song dir once, instead of several times. 2015-03-24 12:05:41 -06:00
Kyzentun 96259ab951 Fixed voltage calculation by making avg_bps a float instead of an int. 2015-03-23 22:41:15 -06: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
Kyzentun a2798e16f4 More aggressive caching. In general, this makes Stepmania avoid looking in the song directory at all if the song is in the cache, in order to load songs faster. All the RadarValue calculations were also rolled into one to reduce the time needed to build the cache. 2015-03-23 11:35:30 -06: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