Commit Graph
34749 Commits
Author SHA1 Message Date
tuxdude143 3c12959f72 Fix 2015-04-18 21:19:29 +12:00
tuxdude143 01039d048b Files for a catagorised options menu 2015-04-18 21:08:15 +12:00
Kyzentun 603d8128f3 Merge pull request #553 from dguzek/Fix-ThemePrefs
Fix theme prefs
2015-04-17 00:43:41 -06:00
Jason Felds 52d2c99048 Merge pull request #558 from wolfman2000/wolf-cmake-cpack-clean
Provide initial cpack support. Mainly for devs.
2015-04-16 18:34:04 -04:00
Jason Felds 028229f881 Allow for assembly free[r] tomcrypt builds. 2015-04-16 18:31:29 -04:00
Jason Felds 66f67dcbc2 ...case sensitivity. 2015-04-15 19:22:39 -04:00
Jason Felds 1bb24245ce Only use -lva for StepMania, not ffmpeg. 2015-04-15 19:08:51 -04:00
Jason Felds e4807b9b85 Allow for the va library to be used with ffmpeg.
This needs verifying.
2015-04-15 18:22:36 -04:00
Kyzentun fc6ce722ca Disabled late join on SSM if on extra stage to prevent crash in summary screen. 2015-04-14 12:25:40 -06:00
Kyzentun b35683f7ff Merge pull request #564 from hanubeki/lang-ja
Update Japanese translation
2015-04-14 07:25:34 -06:00
hanubeki 5a5fc390ae More Japanese translation 2015-04-14 21:57:04 +09:00
hanubeki ba1dc48856 Add missing language line found by find_missing_strings_in_theme_translations 2015-04-14 11:26:01 +09:00
hanubeki 275619df33 Update niler's Japanese language files to 2015/04/11. 2015-04-14 11:22:35 +09:00
Kyzentun b4690fe932 Merge pull request #562 from sigatrev/master
ancient NoteData::ClearRangeForTrack bug fix
2015-04-13 17:53:14 -06:00
sigatrev b4f861a8d5 ancient NoteData::ClearRangeForTrack bug fix
When clearing a range, if the first note in any track in the range was a
hold note, it would place it a hold the end of the cleared range.
2015-04-13 18:51:02 -05:00
Kyzentun b04e7faec6 Fixed RevertFromDisk by making it turn off the InStepEditor flag while reloading the song. Removed redundant call of loaderSSC.TidyUpData from NotesLoader::LoadFromDir because loaderSSC.LoadFromDir calls it. 2015-04-13 10:33:09 -06:00
Kyzentun bac4356672 Changed TimingData to always return the entry before the closest one when using the lookup table to avoid various problems that occur only when the current time is exactly on the current entry in the lookup table. 2015-04-11 22:50:06 -06:00
Jason Felds 361df3a496 Provide initial cpack support. Mainly for devs.
There are two targets you may not be familiar with, `install` and `package`.
* For Linux, `install` now defaults to `/usr/local`, but you can set it back to `/opt` with `cmake -DCMAKE_INSTALL_PREFIX=/opt` if you wish.
* For Windows, `install` may not work, but this is not a target you would want usually.
* For Linux, `package` has not been tested yet. It will likely create an archive file of what is installed.
* For Windows, `package` will create an NSIS package that can be used to install StepMania. One minor change as a result is that the binary and companion dlls will be placed in `bin` instead of `Program` now, but it makes no difference code-wise.

Mac OS X users: for now, use the `dmg` target instead.

This commit does *not* deprecate the original nsi script yet. The Texture Font Generator program has not been addressed yet.
2015-04-11 23:47:42 -04:00
Kyzentun cf3c967a51 Allow songs with invalid characters such as # in the title to work by calling TidyUpData after loading. 2015-04-10 22:40:49 -06:00
Kyzentun 1c3db82537 Modified StepsID operators to consider 0 equal to all other hash values. See comment in source for details. Changed operator>>(RString&, int&) functions to be based off a template. 2015-04-10 09:10:51 -06:00
Kyzentun 60349d849e Modified NoteDataWithScoring::GetActualRadarValues to use the time between the first and last hittable notes instead of the first and last seconds of the song because the song could start or end with mines or other unhittable notes. 2015-04-08 20:15:18 -06:00
Kyzentun 8993cfe729 Added MuteActions preference checking to RageSound::PlayCopy. Modified ActorSound and GameSoundManager::PlayOnce to take is_action args. Fixed doc for playcommand to mention the param table. 2015-04-08 16:15:14 -06:00
Kyzentun 84b57e7ca4 Song::TidyUpData needs to happen after edits in the song folder are loaded so that their radar stuff will be calculated. Bumped cache version. 2015-04-07 12:47:51 -06:00
Kyzentun 76a00574e1 Merge pull request #554 from Thumbsy/patch-1
Last two lines that were left untranslated
2015-04-07 07:19:20 -06:00
Thumbsy f5a447e65e Last two lines that were left untranslated
This should be all for now.
2015-04-07 14:18:39 +02:00
Kyzentun 8aa2d42427 Added rec_print_children and rec_print_table to _fallback. Updated changelog. 2015-04-07 00:04:34 -06:00
Kyzentun 8c33bf92fb Merge pull request #541 from kyzentun/board_under_everything
Board under everything
2015-04-06 23:35:04 -06:00
Kyzentun 2bb0ff1bc5 Merge pull request #548 from Wallacoloo/master
'Exit' option in 'select game' menu returns user to main options menu unless the game mode was changed
2015-04-06 23:34:14 -06:00
Kyzentun 3cb7b5d2a5 Typo fix in ScreenEdit help from SpookyMagician. 2015-04-06 23:00:51 -06:00
Kyzentun 2f5748fe4d Fixed conflicts and order in Changelog_language.txt. 2015-04-06 22:54:45 -06:00
Kyzentun 9658252bc3 Merge pull request #543 from kyzentun/edit_timing_data
Shift timing data in Edit Mode
2015-04-06 22:50:56 -06:00
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
Jason Felds f78574e5a7 More cmake changes:
* Replace `string(CONCAT ...)` with an equivalent call for the cmake 2.8.12 users.
* Use `execute_process` instead of the deprecated `exec_program`. This will work regardless of version (assuming the minimum is met at least).

This should address issue #549.
2015-04-06 22:35:04 -04:00
Dan Guzek 3d7cb7305b change broadcasting of ThemePref changes
I moved a MESSAGEMAN:Broadcast() call so that it only broadcasts the setting that has been saved.  This seems more sensible to me, but it is possible I'm misinterpreting the original design here.

Feel free to merge or not merge this commit. :)
2015-04-06 21:21:23 -04:00
Dan Guzek ce8669f049 default theme doesn't need ThemePrefs.ForceSave()
As noted in my previous commit message, I think ThemePrefs.ForceSave()  can safely be deprecated.  Since many novice themers look to default when learning, I think it's better to use ThemePrefs.Save() as the system was originally designed.

I moved the ThemePrefs.Save() call out of ScreenTitleMenu decoration to ScreenOptionsService in.  This seems safer to me; Pay/Freeplay never hit ScreenTitleMenu which could be another reason ThemePrefs would never get saved.

Additionally, moving the call to ScreenOptionsService in also seems to have fixed a bug where switching themes via the Appearance Options service menu would cause the new theme to inherit all of the previous theme's ini settings.  I'm still not entirely sure why.

I've done a fair amount of testing with this.

I've tried deleting the ThemePrefs.ini file outright and booting fresh into both default and Simply Love.  In both cases, the ThemePrefs.ini file is written when StepMania exits or when the user hit ScreenOptionsService, whichever comes first.

I've tried switching between various themes, including those that did not use ThemePrefs.  I haven't seen any sections being created erroneously and themes that do use ThemePrefs don't seem to inherit the previous theme's settings any longer.

Still, it *very* possible that I've missed some edge case(s) and is probably worth a few people testing before merging.
2015-04-06 21:18:47 -04:00
Dan Guzek f0e46ecb49 fix ThemePrefs
The ThemePrefs table contains several functions and single standalone variable, NeedsSaving.  When a themer calls ThemePrefs.Save() the system will check the status of NeedsSaved to determine whether it really needs to save or not.  This is by design to prevent unnecessary writing to disk.

As far as I am able to discern, NeedsSaved would never be anything but false due to scoping within the ThemePrefs table.  This commit properly scopes that variable as it used within the functions.

It looks like ThemePrefs.ForceSave() was added as a workaround; it didn't check the status of NeedsSaved and just always saved, "no matter what."  Though it seems safe to outright remove ForceSave(), I'm leaving it in for compatibility.  Consider it deprecated I suppose.
2015-04-06 21:08:12 -04:00
Dan Guzek 666cdb40bd IniFile fix: checking for false ~= checking for nil
false is a perfectly valid setting for one of SM's ini files.  The code here needs to ensure that both the key (string) and the value (string, numeric, boolean) read from file exist.  It would previously halt if the value was set to false.  This fixes that by explicitly checking for nil.
2015-04-06 21:01:52 -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
Thumbsy cd75c97d19 Dutch translation update
Also a small fix(?) in the language changelog. One section appeared to
be misplaced.
2015-04-06 23:58:03 +02:00
Colin Wallace 6bccc97c3a 'Exit' option in 'select game' menu returns user to main options menu unless the game mode was changed (#525) 2015-04-06 07:01:48 +00:00
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
Kyzentun d7e032b478 Added 1, 2, and 4 measure choices to shift menus in edit mode. 2015-04-04 22:38:18 -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
Kyzentun 9e5081476f Added timing menu options to Edit Mode that allow shifting and copying timing segments of a chosen type in the selected region or everywhere below the cursor. 2015-04-04 09:10:00 -06: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 6bedfcaf74 Added NoteField board files. 2015-04-03 14:21:42 -06:00