Jonathan Payne
ef5a650b76
merge 84a8d3a
2014-08-05 15:43:57 -07:00
freem
84a8d3adfb
replace psychopathic mapconv.exe with one compiled by "g++ (rev5, Built by MinGW-W64 project) 4.8.1"
...
This is probably the part where someone says "why do we have the compiled binaries in the source tree anyways if they're just going to cause problems like this?"
2014-08-05 13:52:10 -05:00
freem
38aa07ce38
Kyzentun: it's not your fault that our mapconv.exe is psychopathic
2014-08-05 13:49:05 -05:00
Kyzentun
75a1defea0
ifdef'ed out AddATIToList and RemoveATIFromList on WIN32 because they cause mapconv to crash.
2014-08-05 11:52:31 -06:00
freem
6a39fb5ded
Changelog_SSCformat.txt said we were on v0.82, but Song.h said we were on v0.81... fix that.
...
also update FILE_CACHE_VERSION to regenerate cache for #PREVIEWVID tag (if it isn't already)
2014-08-05 10:45:15 -05:00
Kyzentun
d1a84f979d
Changed GradeDisplay::SetGrade to print errors instead of segfaulting on unloaded actors.
2014-08-04 20:08:56 -06:00
freem
f311902765
fix REALLY BAD TYPO in GradeDisplay:SetGrade Lua function.
...
this is dumb and I'm too lazy to find out who's REALLY to blame so I want to assume it's my fault, probably. If anyone wants to bother clearing my name, check the stepmania SVN history. I don't care enough :v
2014-08-04 18:46:29 -05:00
Kyzentun
f3f7af7045
Changed RollingNumbers to not set NAN velocity.
2014-08-03 22:38:01 -06:00
Kyzentun
bffeda6dc0
Pretend I didn't forget the +1.
2014-08-02 19:44:25 -06:00
Kyzentun
f58f111cfd
Changed GetStylesForGame to not traverse the list of styles twice.
2014-08-02 19:34:39 -06:00
Kyzentun
e907454943
Merge branch 'GetStylesForGame' of https://github.com/sigatrev/stepmania
2014-08-02 17:17:17 -06:00
sigatrev
3478bc7650
added GetStylesForGame method
2014-08-02 18:09:52 -05:00
Kyzentun and Jonathan Payne
dd82ec734d
Disabled AddATIToList on Windows because it makes mapconv crash.
2014-08-02 00:39:00 -07:00
Kyzentun and Jonathan Payne
6b346e8e0b
Added MusicWheel:GetSelectedSection.
2014-08-02 00:38:58 -07:00
Kyzentun and Jonathan Payne
2020c9b3bf
Fixed invalid note type trace to use correct escape sequence.
2014-08-02 00:38:57 -07:00
freem and Jonathan Payne
2910fca47b
<Mad_Matt> hahaha. apparently I accidentally included my libtomcrypt and libtommath in my TapNote enum pull request
...
<Mad_Matt> someone should probably remove those
2014-08-02 00:38:57 -07:00
Kyzentun and Jonathan Payne
95be537d2c
Reverted BitmapText::LoadFromNode back to previous logic.
...
BitmapText now looks up font names in Fonts/ if the path doesn't resolve, so LoadFont is obsolete.
Added optional arg to ActorUtil::ResolvePath and GetAttrPath to make them not report an error when something is optional.
2014-08-02 00:38:55 -07:00
freem and Jonathan Payne
87b7aa36a3
Make default value for NumBackgrounds preference 10.
...
(The previous value, 8, was unable to be selected in the menu, so it was always getting changed. Thanks to Mad Matt for pointing this out)
2014-08-02 00:38:54 -07:00
Kyzentun and Jonathan Payne
9339f5dfb8
Changed GameCommand screen validation to allow OptionsList to work again.
2014-08-02 00:38:52 -07:00
freem and Jonathan Payne
0b3e03fee5
telling Visual Studio to shut up about more warnings wrt/double and float
2014-08-02 00:38:52 -07:00
freem and Jonathan Payne
ee3efaf36b
we dropped Visual C++ 6 support a long time ago, so remove most of the boolean operator hacks.
...
However, the == one is still required (at least on Visual Studio 2008, not sure about others).
Feel free to revert this if it's causing problems elsewhere.
2014-08-02 00:38:51 -07:00
sigatrev and Jonathan Payne
9e0a42680a
fix ActorScroller wrapping
...
looping actor scrollers would never reach destination items with number
higher than the number of items.
2014-08-02 00:38:50 -07:00
freem and Jonathan Payne
ab4cceff31
explicit float postfix added to some numbers in order to get visual studio to shut up
2014-08-02 00:38:50 -07:00
sigatrev and Jonathan Payne
82cb4a198d
Enums for TapNoteType, TapNoteSubType, and TapNoteSource
...
I intend to make additional useful information available on judgments,
such as TapNoteType and TapNoteSubType( for hold judgments ).
I am submitting this part as a separate pull request because it is more
generally applicable to anything TapNote related.
2014-08-02 00:38:48 -07:00
Kyzentun and Jonathan Payne
3945a4a34b
Improved three-key support. Default theme should be completely usable with three-key cabinets if ThreeKeyNavigation pref is true. Added ThreeKeyNavigation pref. ScreenOptions:NavigationMode metric now uses that pref to decide between normal and toggle modes. Added GoToFirstOnStart to OptionRowHandlerLua so an option row can control that behavior. Rewrote input for default's ScreenSelectProfile to use an input callback to take advantage of menu button mapping. Fixed inconsistent indentation in ORHL documentation.
2014-08-02 00:38:46 -07:00
freem and Jonathan Payne
6af6f98a05
make [ScreenHowToPlay] CharacterName metric work again
2014-08-02 00:38:45 -07:00
Kyzentun and Jonathan Payne
82c07d04b3
Fixed UpdateHasteRate and PlayerInfo:GetLifeMeter to check whether the life meter is null before using it.
2014-08-02 00:38:44 -07:00
sigatrev and Jonathan Payne
52c2801503
UpdateSongPositions
...
It is useful to have Player SongPositions update off of ScreenGameplay
for use with things like ArrowEffects.
ScreenGameplay, ScreenHowToPlay, and ScreenEdit stop GameSoundManager
from running GameState:UpdateSongPosition and do it themselves, so this
has no impact on the screen classes that cared about, and thus updated,
player SongPositions.
2014-08-02 00:38:43 -07:00
freem and Jonathan Payne
46e7ff7ead
fix really awkward positioning of this line (was using spaces instead of tabs)
2014-08-02 00:38:42 -07:00
Kyzentun and Jonathan Payne
2134151b90
Added Sprite::NewBlankSprite for use by NoteSkinManager. Removed default texture loading from Sprite::Sprite. Should fix problems with white banners and garbage on videos.
2014-08-02 00:38:40 -07:00
Kyzentun and Jonathan Payne
2e43a70752
Fixed Course::GetTotalSeconds to work on courses that don't have a medium difficulty. A course with only double charts was probably the one that made the crash manifest.
2014-08-02 00:38:39 -07:00
Kyzentun and Jonathan Payne
1a18d64f09
Added revalidation scheme to NoteData's all_tracks_iterator so that it can be made valid again after the NoteData is transformed by something adding or removing steps. This fixes the crash on courses that use transform mods on the second song. ITG2's Getting Started is an example.
2014-08-02 00:38:38 -07:00
sigatrev and Jonathan Payne
ada902140e
add OldStyleStringToDifficulty method
...
because SM recognizes them in .sm files.
2014-08-02 00:38:35 -07:00
sigatrev and Jonathan Payne
e8e617e545
SavePreferences
...
for custom option screens.
2014-08-02 00:38:35 -07:00
Kyzentun and Jonathan Payne
9b08ab5b52
Created GameLoop::ChangeGame analogous to GameLoop::ChangeTheme. Changed ChangeTheme to use the AfterThemeChangeScreen metric instead of a passed in screen name from the theme being changed away from. ChangeGame uses the AfterGameChangeScreen and AfterGameAndThemeChangeScreen metrics to pick the screen to load after the change. New metrics are optional and default to InitialScreen. Changed ScreenManager::ThemeChanged to not duplicate the code in ReloadOverlayScreens. Fixed ScreenManager::IsScreenNameValid to check with HasMetric before using GetMetric. Changed game ConfOption logic to set the preference and work in a similar way to the theme ConfOption. Added THEME:SetTheme lua function.
2014-08-02 00:38:34 -07:00
Kyzentun and Jonathan Payne
5828b2529b
Fixed two typos.
2014-08-02 00:38:33 -07:00
Kyzentun and Jonathan Payne
adfc259b71
Changed CheckEnum to use lua_isnoneornil so that enum args can be made properly optional. Changed PlayMusicPart to allow nil for optional args so optional args would be independent.
2014-08-02 00:38:33 -07:00
sigatrev and Jonathan Payne
fe08728393
add SOUND:IsTimingDelayed method and fixed SOUND:PlayMusicPart
...
PlayMusicPart does not immediately start the new music. IsTimingDelayed
will return true until the new music has started.
The "applyRate" argument of PlayMusicPart was being applied to the
"align_beat" property. Added an additional argument to for "align_beat"
and made "applyRate" work properly.
2014-08-02 00:38:32 -07:00
Kyzentun and Jonathan Payne
4dfeb3eb89
Changed NoteSkinManager::LoadActor to always return a Sprite on failure because some elements must be a sprite.
2014-08-02 00:38:31 -07:00
Kyzentun and Jonathan Payne
8657d70fe1
Created Def.LogDisplay for displaying messages in a log. Changed error reporting layer to use Def.LogDisplay. Changed engine error reporting to not clip errors to a single line.
2014-08-02 00:38:29 -07:00
Kyzentun and Jonathan Payne
88f56cb0ec
Tested and fixed error reporting for NoteSkinManager. Changed Sprite::Sprite() to load the default texture.
2014-08-02 00:38:27 -07:00
freem and Jonathan Payne
aef6e287f9
[ScreenSystemLayer] restore "Not Present" text in CoinMode_Home
...
(also gave a possible answer to the comment added during the removal of pay mode)
2014-08-02 00:38:27 -07:00
Kyzentun and Jonathan Payne
a9056c20d1
Changed NoteSkinManager to use new error reporting and avoid crashing. Fixed DoChangeTheme to switch to the InitialScreen if the screen doesn't exist in the theme being changed to. Fixed error reporting in MeterDisplay.
2014-08-02 00:38:26 -07:00
Kyzentun and Jonathan Payne
8a6f6a7124
ActorUtil::ResolvePath updated for error reporting. Changed BitmapText to work with either a font name or a path. ThemeManager::GetPathInfoRaw fixed to use correct error dialog. ThemeManager::GetPathInfo fixed to report correct error for missing theme elements.
2014-08-02 00:38:26 -07:00
Kyzentun and Jonathan Payne
4343a99ea9
Changed many parts of GameCommand to improve error reporting. Fixed GameCommand setpref to not set when loading the command. Minor fix to ScreenOptionsExample.ini to explain that SongInCurrentSongGroup is unusable. CommonMetrics, CourseContentsList, HoldJudgent, OptionRowHandler all have minor changes to fix crashes on malformed theme data.
2014-08-02 00:38:25 -07:00
Kyzentun and Jonathan Payne
5df80b6e0e
Changed many places that used RageException to use ReportScriptError instead. Wrote ScreenOptionsExample.ini as documentation example for the OptionRow system. Rewrote gamecommands.txt to include all GameCommands. Fixed Commands::GetOriginalCommandString to insert the semicolons that separated the original commands. Changed nonsensical boolean |= true statements in GameCommand.cpp to just use =. Added protection to ReportScriptError to keep it from recursing through itself when an error occurs in error reporting. Added UseAbort option to ReportScriptError for places that want to use an AbortRetryIgnore dialog to query the user. Added ScriptErrorMessage for places that need to handle the warning/dialog part separately. Added logging flag to MESSAGEMAN so that all messages broadcast can be logged when desired. Changed OptionRowHandler::LoadInternal to return a boolean success value as part of error handling.
2014-08-02 00:38:24 -07:00
sigatrev and Jonathan Payne
ce2b729710
SetGame method
...
Added SetGame method to GameManager.
Altered Stepmania::ChangeCurrentGame() to allow a second input,
selecting which theme will be loaded after game is changed.
2014-08-02 00:38:23 -07:00
Kyzentun and Jonathan Payne
cc548a8cb5
Moved error reporting to ScreenSystemLayer error.lua. ScreenSystemLayer overlay/default.lua restored to previous. Error messages are now broadcast with the ScriptError message instead of SystemMessage. Added show/hide error messages toggle and clear error messages to debug menu. Nuked ScreenConsoleOverlay for being unfinished and duplicating ScreenSystemLayer. Changed Actor:tween and Tween::CreateFromStack to use ReportScriptError on invalid tween params. Changed some OptionRowList things to use ReportScriptError on invalid metrics.
2014-08-02 00:38:21 -07:00
Kyzentun and Jonathan Payne
8e74a512ad
Changed InputFilter to not assert on unrecognized input devices or buttons.
2014-08-02 00:38:20 -07:00
freem and Jonathan Payne
194c8de8f8
add pkgingo's (Win32) Minimaid driver.
...
* new makefile config option "HAVE_MINIMAID"
* update all Visual Studio projects
2014-08-02 00:38:20 -07:00