Commit Graph

61 Commits

Author SHA1 Message Date
AJ Kelly 54b6dffb75 Fix a rounding bug that effected screenshots and resolutions.
Previously, you may have gotten values like 639x480 (4:3) or 853x480 (16:9).
These are due to rounding errors caused by lrintf; ceilf does what we really want.

[RageDisplay.cpp] modified screenshot function
[ScreenDimensions] modified SCREEN_WIDTH and SCREEN_HEIGHT algorithms (no longer do you need to SCREEN_WIDTH+1 for 16:9 support)
[StepMania.cpp] modified windowed mode width calculation
2010-03-21 17:02:42 -05:00
AJ Kelly f0b911725b "freestyle" in .ksf files should be considered as a doubles chart. This should fix it. 2010-03-15 18:48:33 -05:00
AJ Kelly dca9182138 various cleanup and commenting 2010-03-14 19:46:05 -05:00
AJ Kelly 5ef1c42e3b ScoreKeeperNormal double shot.
1) convert toasty trigger from a single number to a Lua table. Only problem is, the toasty only triggers on the first one. Since this makes it equivalent to how it was set up before, I'm okay with this.
2) FSX submitted a patch that supposedly fixes the broken combo problem. I can't fully test this, so I'm committing it in the hopes that someone else tests it too.
----
Various theme fixes/changes as well.
2010-03-14 19:24:17 -05:00
AJ Kelly 04317c14ae f8270c6, "draw glow using stroke texture" forces the BitmapText to glow both the inner and stroke elements. This makes BitmapText elementswith an invisible stroke have a glowing stroke instead. Not good.
To combat this, I have developed the BitmapText::textglowmode command, along with the TextGlowMode enum.
Valid values include 'TextGlowMode_Inner', 'TextGlowMode_Stroke', 'TextGlowMode_Both'.
2010-03-12 19:47:08 -06:00
AJ Kelly b5b761234e 23e241a: if a BGCHANGE file can't be resolved, don't use the specified effect because it may require 2 files and all random BGs specify only 1 file [Chris Danford] 2010-03-12 14:09:35 -06:00
AJ Kelly 0c96a43e98 update docs, cleanup memcardman comments and such 2010-03-11 23:48:39 -06:00
AJ Kelly a059209dcb GrooveRadar base is now an ActorFrame. 2010-03-11 19:14:54 -06:00
AJ Kelly f38037b7a8 re-add the ability to reload a theme's Lua scripts, this time via Ctrl+F2. 2010-03-11 13:44:51 -06:00
AJ Kelly cd17227872 don't add checkpoints to combo if autoplay is on. 2010-03-11 13:31:40 -06:00
AJ Kelly 5ea71cfa1b thanks for fixing my oversignt jnr :D
oh right merging of the branches and such etc. etc.
2010-03-09 13:23:05 -06:00
Nicole Reid 0213ac82d4 Fix apparent typo in Player.cpp. 2010-03-09 13:52:36 -05:00
AJ Kelly a7b52df0fa cleanup and comment part unknown of a trillion 2010-03-09 12:21:56 -06:00
AJ Kelly 31c69f1d9c okay I'm not done with the commits yet but mercurial is not making it easy for me
to commit just a subsection of files so I have to dump everything in here. :|
2010-03-09 03:36:44 -06:00
AJ Kelly 8ba30b523c SM4SVN commits, all code by Chris Danford:
* 57e8159: fix handling of noteskins with an uppercase letter
* 3be4d7e: track W4 full combo
* f8270c6: draw glow using stroke texture
2010-03-09 03:22:58 -06:00
AJ Kelly 4d50f8da6e [ScreenEvaluation] new metric DetailLineFormat. must contain two integer flags (%d or %i should work.) 2010-03-09 03:22:05 -06:00
AJ Kelly fbd156c00f [ScreenNetEvaluation] add GetNumActivePlayers() binding, as well as UpdateNetEvalStats message (has one param, ActivePlayerIndex). 2010-03-09 03:21:22 -06:00
AJ Kelly 74d7895ccd add ScreenSelectMaster:GetSelectionIndex() Lua binding.
Example usage:
LoadFont("Common normal")..{
	InitCommand=cmd(xy,SCREEN_RIGHT-32,SCREEN_BOTTOM-32;shadowlength,0;horizalign,right);
	OnCommand=cmd(playcommand,"Set");
	SetCommand=function(self)
		local selIdx = SCREENMAN:GetTopScreen():GetSelectionIndex(GAMESTATE:GetMasterPlayerNumber());
		self:settext(selIdx);
	end;
	MenuSelectionChangedMessageCommand=cmd(playcommand,"Set");
};
2010-03-09 03:20:44 -06:00
AJ Kelly 4103c75e19 re-add b5129dd: Allow for 'confirmation only' double press mechanisms as a choice for two part selection on ScreenSelectMusic
(small cleanup on ScreenDimensions)
2010-03-01 17:46:41 -06:00
AJ Kelly 02c7037721 sm-ssc v1.0 Public Beta 1 code changes 2010-03-01 00:44:39 -06:00
AJ Kelly 60b86919ba [Player] CheckpointsFlashOnHold metric added (bool). also cleanup/comment/etc. 2010-02-24 02:40:36 -06:00
AJ Kelly 01137a22f5 Two of the CodeDetector codes referenced Frieza's old MusicBannerWheel, which is not in use anymore. I have repurposed these to be Next/Previous group, a la Pump it Up. The metrics have been changed to reflect this. Also changed an assert message to be more useful in NoteField.cpp 2010-02-22 00:47:31 -06:00
AJ Kelly 16dd56bdd3 Allow lighting parameters to be set via XNode in ActorFrame. Only diffuse seems to work... 2010-02-19 22:44:05 -06:00
AJ Kelly f42dd5b6af hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate hate 2010-02-19 16:40:18 -06:00
AJ Kelly c43635b6b3 efa81bc: don't filter NoteSkins at a PrefsManager/NoteSkinManager level. Leave the NoteSkin sorting and filtering up to the theme. [Chris Danford]
ScreenWithMenuElements.cpp - add Cancel command, so actors can react to Cancel.
GameState.cpp - cleanup
2010-02-19 16:05:50 -06:00
AJ Kelly 5c5ef54a48 various changes from sm4 and sm-ssc (svn); see updated changelog for the full information 2010-02-18 23:17:24 -06:00
Jason Felds 4791b411d1 Add files to Mac build. Fix compile.
I was getting errors about a missing NotePart_Invalid when
I noticed it wasn't a part of the enum. I don't know if that
was intentional, but it was throwing the compiling off.
2010-02-15 08:28:51 -05:00
AJ Kelly 75861f22a1 various commits from SM4 SVN, courtesy of Glenn and Vyhd. 2010-02-14 23:02:34 -06:00
AJ Kelly 3c09722d3c GetSongList actually has params; should fix MusicWheel.cpp compile 2010-02-13 22:37:22 -06:00
AJ Kelly 034cbc4d83 fixes compiling of Player.cpp 2010-02-13 22:33:43 -06:00
AJ Kelly 6879834149 sm4svn commits (all code by Glenn Maynard)
1fc3636: "working on routine mode"
fb1edc2: "working on routine"
20b5827: "working on routine"
193363b: "working on routine"
bd042f9: "working on routine"
2010-02-13 14:31:58 -06:00
AJ Kelly 777745b7fb sm4svn sync part 2.
528089b: remove preferred group filtering (leaving the setting in for later use) [Glenn Maynard]
96821ad: fix pump routine right side DownLeft not drawn [Chris Danford]
fd88c62: easier debug stepping [Chris Danford]
2010-02-13 13:37:03 -06:00
AJ Kelly a7a8b6b94d syncing with sm4svn part 1.
7534867: fix SSM crashes when selecting a song with only one player enabled
cddaab5: simplify SongUtil::GetStepsTypeAndDifficultyFromSortOrder
615aab0: add Style::GetUsesCenteredArrows (doubles + routine)
17f38e7: sanity check
[all code changes by Glenn Maynard]
2010-02-13 12:50:34 -06:00
AJ Kelly 484820424b CourseType is optional for GetCustomDifficulty().
Sync up Midi's theme changes.
2010-02-11 23:27:17 -06:00
AJ Kelly 00e0c7c801 add TapNote::autoKeysound to NeedsTapJudging, NeedsHoldJudging; Fixes a crash with keysounded files. 2010-02-11 17:42:20 -06:00
AJ Kelly a4a44e6a28 40c5644: Added more logical handling of Routine mode selection (see source code comments); hopefully, we can write up a more standard solution to this later, since this is kind of a hack [vyhd] 2010-02-11 01:06:20 -06:00
AJ Kelly 7f19f8310a Okay so Glenn decided to revert some Frieza code. I'm not going to remove everything Glenn did, as there was some useful code.
However, the ones I agreed with were:

75d5b63 "if a Noteskin fails to be loaded by the time the notes need to be displayed, attempt to force the default theme on and throw errors in to the log rather than crashing SM."
Glenn: There was no indication in the commit of when this was actually happening; this is unnecessary logic that will do nothing but hide bugs.
AJ: Based on some of the other code I've seen in the StepMania codebase, I'd say having this code in GetMetric isn't a good idea. There's an assert for checking if the noteskin isn't empty. That should suffice.

e27e971 "Adds metric options to flash the lifebar when a note is hit"
AJ: There are many possible ways of doing this without having to add a new metric.
The most extreme example is to code your own life bar and mess with JudgmentMessageCommand.
I'm not sure if StreamDisplay would respond to the message or not, but there are multiple ways of getting at the Stream. (ultralight, to be released, contains an example)
2010-02-10 21:23:28 -06:00
AJ Kelly 0f63c3d957 possible fix for handling of delays in autoplay. may also fix things elsewhere (editor?), but that is untested. autoplay seemed to work well with uprock (the song) so I have no complaints. 2010-02-10 03:28:13 -06:00
AJ Kelly c45d0c89c7 fc3d177: Fix GAMESTATE:GetCurrentSteps() only returning single-player steps for any difficulty [vyhd] 2010-02-09 17:01:30 -06:00
AJ Kelly 2d872ac518 427a764: subtractive blend (OpenGL only for now) [Glenn Maynard]
I was looking into writing the equivalent Direct3D code; still not 100% sure if my code is right, so it stays local for now.
2010-02-08 01:32:14 -06:00
AJ Kelly f2f7d2ceeb add [MusicWheel] RecentSongsToShow metric
--------
cleanup
small amount of work on guitar-five (still incomplete)
add more commented out stuff for replay data playback
debug trace combo in order to find out issues with smo-ssc
added old packet names as comments in NetworkSyncManager.h
2010-02-05 13:42:55 -06:00
AJ Kelly 9b8da1f06a fix compile 2010-02-02 20:08:44 -06:00
AJ Kelly ca8f660c4f syncing changes from ssc svn, mostly.
[Course.cpp] HasTimedMods() now actually checks for timed mods (technically non-global) instead of being a clone of HasMods()
[Player.cpp] add MAX_HOLD_LIFE/[Player] MaxHoldLife metric
[ScreenGameplay] looking into places to put loading of replay data, perhaps?
[elsewhere] lots of cleanup, and I'm sure there's lots more to be done.
add a todo to ProductivityHelpers.
2010-02-02 16:00:10 -06:00
Jason Felds 81b4011423 View the list:
* Added new metric to cap the max life of a hold. No sanity checking yet: need a way to keep <= 1.
* Added more Pump specific behavior to lua.
* Fixed combo and hold judgment graphics due to it being defined twice.

Minor cleanup of the ProductivityHelpers is going to have to happen later on.
2010-01-31 00:27:42 -05:00
AJ Kelly 90b4a72021 clean up StepMania.cpp, remove unused and old (and virus false positive) unlockconvert program 2010-01-30 02:02:42 -06:00
AJ Kelly bd55ae3806 small cleanup 2010-01-30 01:44:10 -06:00
Jason Felds 86ef773c27 Line up comments. 2010-01-29 14:13:10 -05:00
Jason Felds 621d408677 Minor cleanup. 2010-01-29 14:10:25 -05:00
Jason Felds 45e3414cf4 Partial revert of resolution.
Also, try to use copyright symbol in the string.
2010-01-29 00:33:28 -05:00
Jason Felds cd12d4b40d More cleanup. 2010-01-28 23:48:05 -05:00