Commit Graph

96 Commits

Author SHA1 Message Date
Kyzentun 8ae17b4422 Changed LifeMeterTime to not crash when not in course mode. Changed _fallback's life settings back to forcing together. Added ForceImmediateFailForBattery theme metric. Gave up on FailFadeRemovePlayer lua function and removed it. 2014-08-19 23:58:35 -06:00
Kyzentun 7e73892e6e Moved LifeType, DrainType, and BatteryLives from Song Options to Player Options. Added ScreenGameplay:FailFadeRemovePlayer lua function. 2014-08-06 23:26:05 -06:00
kyzentun d7fade2f0b Merge pull request #244 from sigatrev/TapNote-enums
Enums for TapNoteType, TapNoteSubType, and TapNoteSource
2014-07-30 23:03:51 -06:00
kyzentun 97bcfb37de Merge pull request #240 from sigatrev/UpdatePlayerSongPositions
UpdateSongPositions
2014-07-30 23:03:41 -06:00
freem bc73e053bb telling Visual Studio to shut up about more warnings wrt/double and float 2014-07-26 19:01:49 -05:00
sigatrev e81af8c131 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-07-25 18:45:02 -05:00
Kyzentun c05a173d52 Fixed UpdateHasteRate and PlayerInfo:GetLifeMeter to check whether the life meter is null before using it. 2014-07-25 00:20:38 -06:00
sigatrev acd3340c57 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-07-24 19:45:17 -05:00
freem 166ae6ea11 fix really awkward positioning of this line (was using spaces instead of tabs) 2014-07-24 17:51:02 -05:00
Kyzentun ec3e76277c Added interface for controlling the behavior of the hasts system. Added support for negative haste. Moves haste rate calculations to UpdateHasteRate. GetHasteRate now just returns the calculated value. Added FLOAT_NO_SPEED_INTERFACE and FLOAT_TABLE_INTERFACE macros to OptionsBinding.h 2014-05-05 14:16:08 -06:00
Kyzentun 0dfb131291 Created SongOptions Lua interface with a similar design to the PlayerOptions interface. Moved enums that were inside SongOptions out and made them Lua accessible. Removed sAutosyncType and associated things from AdjustSync.cpp because it was unused. Added DefaultNilArgs and FArgGTEZero to LuaBinding as helpers. Moved INTERFACE defines from PlayerOptions.cpp to OptionsBinding.h. 2014-05-03 19:27:32 -06:00
Kyzentun 421a9be57b Ripped out existing PlayerOptions Lua interface and replaced it wholesale. Removed PrefsManager's DefaultFailType enum. Moved PlayerOptions::FailType enum to GameConstantsAndTypes and made it Lua accessible. Changed ModsLevel enum to include ModsLevel_Current to make accessing that ModsLevel easier to access. Rearranged ModsGroup appropriately. Added non-const Get functions to ModsGroup. Removed PlayerOptions.m_bSetTiltOrSkew because it had no reason to exist. Moved 200.0f to the const CMOD_DEFAULT because it was being used in more than one place. 2014-05-01 23:23:20 -06:00
sigatrev 25ddd69208 added GetHasteRate method, made GiveUpSeconds a metric
without haste rate, it's impossible to display an accurate BPM. Give up
time should be controllable.
2014-04-15 12:27:54 -05:00
Ben "root" Anderson c3daaf9ae2 Hack around ScreenGameplaySyncMachine trying to do a network game 2014-01-14 16:19:46 -06:00
Devin J. Pohly 106838cf64 fix warning about const float 2013-01-31 13:35:39 -05:00
Devin J. Pohly ce507b9800 use empty TimingData in Steps to signify fallback on Song timing.
This required using the new Steps::GetTimingData function and the allowEmpty
parameter to TimingData::TidyUpData when appropriate, as well as clearing the
TimingData to remove step timing rather than coping the song timing over it.

Fixes some odd editor behavior when changing song timing, and is overall a
slightly less hacky way of doing things.
2013-01-23 14:51:18 -05:00
Devin J. Pohly d13ac7e7a2 modify Input() on screens to return boolean 2013-01-12 22:48:38 -05:00
Devin J. Pohly bd0e2074ad replace ASSERT(0) with useful fail messages 2012-12-27 16:59:35 -05:00
Jason Felds 1fc16698ba War on -Werror, part 12: explicit bool usage.
It may save a few cycles, but it's best to be
explicit on boolean operations, especially with
ASSERT.
2012-12-27 11:38:53 -05:00
Jason Felds bddbed7e7e war on -Werror, part 11: const int -> float loss.
Had to work around the inline static const int rule
to do it, but at least there is no data loss now.
2012-12-27 11:13:41 -05:00
Devin J. Pohly 1f80e3be4c remove code in ScreenGameplay that doesn't do anything 2012-12-26 20:15:56 -05:00
AJ Kelly 74065ff0fd [ScreenGameplay] When ShowLifeMeterForDisabledPlayers is true, don't fill up life in the meter for the disabled player. (LifeMeterBar only) 2012-07-03 12:51:03 -05:00
Jason Felds 08d3abbe44 New branch: [sm5a2futures]
Want to make sure we don't cause conflicts for future 1a builds.

This commit: change the sentinel for launching attacks immediately.

This way, songs with negative gaps can have attacks work here.

Thanks to Saturn for the assist.
2012-02-23 22:50:03 -05:00
Jason Felds 066d6c17dd Fix metric. 2011-12-21 15:28:08 -05:00
Jason Felds 058f03e495 Allow versus oni graceful failure. 2011-12-12 21:27:32 -05:00
Jason Felds 2d3c3628a1 Add the SurvivalModOverride metric. 2011-11-28 19:13:15 -05:00
AJ Kelly b141db3f55 small todo for later when I have time 2011-11-25 17:19:24 -06:00
Mark Cannon deb8ea5347 fix compile error, change RString to const RString& because I can; again, PLEASE try to compile your build before committing it :| 2011-10-06 23:32:23 -04:00
Flameshadowxeroshin a108138d21 prepare for announcer changes. the game WILL NOT COMPILE right now. 2011-10-06 12:42:09 +00:00
Jason Felds 9153e80769 Remove unneeded comment. 2011-08-30 13:18:45 -04:00
AJ Kelly 06c447026d [ScreenGameplay, LyricDisplay] Stop lyrics from animating on failure. Fixes issue 298. 2011-07-31 12:54:21 -05:00
Jason Felds dbdab4759e [Xcode4] May as well fix switch warnings.
Still need some assistance for the linker error.
2011-07-20 11:11:04 -04:00
Jason Felds 48226f2027 No longer store #NOTES in cache.
Use the #STEPFILENAME tag to access the files
as appropriate.

To the betting pool fans: file cache version is 192.
2011-07-17 16:06:40 -04:00
Jason Felds 094f6dc73c No combo fail until health is gone.
Also, on FAIL OFF, no failing whatsoever.
2011-07-03 17:47:55 -04:00
Jason Felds 5940bdeddb More abstraction. 2011-06-30 02:10:58 -04:00
Jason Felds 8bc2c38142 Replace #BEAT tags with #SECOND tags.
Split Timing has made this necessary.

Yes, this means another recache.
2011-06-30 01:11:38 -04:00
Jason Felds 92a304ab8a Minor simplification.
We should eventually make it not required to scroll horizontally.
2011-06-29 23:25:42 -04:00
Jason Felds 4ab534de75 Use NoAttacks vs StepAttacks. 2011-06-26 23:58:24 -04:00
Jason Felds fcf9e335e6 Use StepAttacks instead.
This deprecates the GetSongAttacks lua function.

Next up: make it so that no text is displayed if
Step Attacks are on, but display "No Attacks" if
attacks are turned off.
2011-06-24 12:12:27 -04:00
Jason Felds e7afe0ef8e Load attack data from the Steps. 2011-06-24 11:51:06 -04:00
Jason Felds 2a39516bc6 Right, load step attacks, not song. 2011-06-24 11:31:48 -04:00
Jason Felds fc9f07158a 99% fix scoring with warps and fakes.
Now all charts can seek 100%.

This does force yet another cache reload.

Hopefully it won't slow first loads too much.
2011-06-08 16:14:11 -04:00
Jason Felds fec932e153 More prep work for better radar calculations. 2011-06-08 15:02:54 -04:00
Jason Felds 0a7b9ce170 Some respect for OOP. (MasterPlayerNumber) 2011-06-06 20:40:11 -04:00
Jason Felds 963cc9d4f1 Fix a Player 2 assist tick / clap bug. 2011-06-06 20:23:23 -04:00
AJ Kelly 785a9f93a5 small todo comment 2011-06-05 00:45:25 -05:00
Jason Felds 461deced3a Let's be doubly sure Survivals work.
If a themer uses a non-existant default noteskin...

...well, at this point we're not responsible I think.
2011-05-27 23:28:14 -04:00
Jason Felds 6588753328 Comment no longer needed. 2011-05-27 11:14:14 -04:00
Jason Felds 002ea6c11a I want others to read this comment.
Check the diff.
2011-05-27 10:12:19 -04:00
Jason Felds 0f1e2c59ed Updated comment/TODO. 2011-05-23 11:26:53 -04:00