Commit Graph
100 Commits
Author SHA1 Message Date
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
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 9cf1f44443 update some documentation. 2010-03-05 21:29:25 -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 23f944ec7c fix credits file... misattribution blargh 2010-03-01 01:22:02 -06:00
AJ Kelly 6014c22be6 sm-ssc v1.0 Public Beta 1 docs 2010-03-01 00:46:49 -06:00
AJ Kelly 02c7037721 sm-ssc v1.0 Public Beta 1 code changes 2010-03-01 00:44:39 -06:00
AJ Kelly 42baa6f3f9 sm-ssc v1.0 Public Beta 1 theme changes 2010-03-01 00:41:15 -06:00
AJ Kelly 1e9975dada Update Pump noteskins (thanks Daisu) 2010-03-01 00:36:07 -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 9045d04356 add transitions to SM4 portKit. 2010-02-21 23:33:59 -06:00
AJ Kelly 051f224ff1 various theme things 2010-02-20 16:44:59 -06:00
AJ Kelly cbda9d7914 add some missing fonts, make frutiger load game characters 2010-02-19 22:44:41 -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 2c19a3fab1 why the hell didn't this get merged in correctly 2010-02-18 23:18:32 -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
AJ Kelly f9bfc80fa9 restore some stuff I had nuked; whoops. sorry wolfman. 2010-02-17 20:48:30 -06:00
AJ Kelly 435ca51b43 make StepsOrTrailToColor actually return something instead of doing nothing 2010-02-17 20:31:40 -06:00
AJ Kelly dfc5f53134 various theme changes by Midiman and myself. 2010-02-17 19:47:36 -06: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 4a92f73a49 diffuse the GrooveRadar polygons with PlayerColor by default 2010-02-13 17:10:22 -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 d80641ecf1 fix byte order mark issue in customspeedmods 2010-02-06 21:33:52 -06:00
AJ Kelly b79e3c8bbd change line endings in autoconf/config.rpath per this conversation:
[14:20:00] <And4713> and so does ssc if you correct the crlfs in one of the files
[14:20:06] <donkey_dong> which file
...
[14:22:11] <And4713> config.rpath under the autoconf directory
[14:22:49] <And4713> after I did that one everything compiled great, and I even got moonlight working on it as per your comments instructions
2010-02-05 14:25:44 -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 f8b71f2ab9 expand on the message that comes up when people install songs incorrectly 2010-02-04 14:39:49 -06:00
AJ Kelly ed0c3a9251 forgot to replace RoomWheelItem bar with NormalPart/ColorPart in fallback. whoops! 2010-02-04 14:06:24 -06:00
AJ Kelly 825dc8f33e recent theme changes from ssc svn 2010-02-03 23:40:12 -06:00
AJ Kelly 9b8da1f06a fix compile 2010-02-02 20:08:44 -06:00
AJ Kelly 015114ffc7 convert line endings on build.sh to LF (unix) from CR+LF (windows); should make it so you don't have to run dos2unix on it 2010-02-02 16:12:48 -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
AJ Kelly 2979e20fb3 add missing metric 2010-01-30 13:13:23 -06:00
AJ Kelly c727c58fc6 Some theme changes:
* Show StepsDisplay on Evaluation
  * Change combo number on ComboGraph to the font used for in-game combos
2010-01-30 12:36:02 -06: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
AJ Kelly 7f2330d8d5 Theme changes to make other gametypes play nice 2010-01-29 21:16:55 -06:00
AJ Kelly ee0f54a4ca cleanup 2010-01-28 20:48:37 -06:00
AJ Kelly 048c064760 Add vyhd's changes to OptionsList from SM4SVN
Fix icons for compile with Visual Studio 2003 and 2005
Added ScoreKeeperShared to vs.net2003 project, added ffmpeg libs (modern; todo: add modern libs to repo)
2010-01-28 16:52:08 -06:00
AJ Kelly af956dd4e7 Theme changes:
* Disable Left+Right sorting on ScreenSelectCourse [AJ]
* more fun stopbar [Midiman]
2010-01-28 13:18:42 -06:00
AJ Kelly 37323ecec6 attempt to resolve branching issues 2010-01-27 17:36:43 -06:00
AJ Kelly d81927da08 rev 935d0d7 except this time based off the right part? 2010-01-27 16:11:06 -06:00
AJ Kelly b0e82dc9c0 make hgignore better, idfk why steps.lua was changed 2010-01-27 13:09:55 -06:00
AJ Kelly 00a22b354f .hgignore 2010-01-27 13:07:42 -06:00
AJ Kelly ecbfc2ca9b update makefile, clean up ScoreKeeperShared 2010-01-27 01:35:53 -06:00
AJ Kelly 3e51544930 Initial commit. 2010-01-26 21:00:30 -06:00
AJ Kelly 8ceb0a6967 if the wheel is locked, don't allow Ctrl+Letter to sort 2010-01-13 00:43:21 +00:00
AJ Kelly bc331f3fc6 add support for |E| tag from DirectMove KSF files. 2010-01-13 00:07:34 +00:00
AJ Kelly 5a82cbefea remove invalid fov command on pad (ScreenHowToPlay)
make StepsDisplay diffuse based on difficulty again
2009-12-15 23:51:17 +00:00
AJ Kelly 6e47084974 BeginnerHelper fixes; shows the pads now. 2009-12-13 22:14:18 +00:00
AJ Kelly 02b1267c6a fix pad position on ScreenHowToPlay 2009-12-13 21:47:47 +00:00
AJ Kelly acbf6cb2f0 show 5 items in StepsDisplayList instead of 7, solving a visual overflow issue 2009-12-12 18:14:27 +00:00
AJ Kelly f1208f3c93 remove Demonstration graphic in favor of a BitmapText 2009-12-12 18:02:14 +00:00
AJ Kelly a1ce925ae1 give GetCustomDifficulty a valid CourseType to silence an error 2009-12-12 17:50:01 +00:00
AJ Kelly db0ddf9771 Fix up ScreenHowToPlay (character, decorations draworder)... pad location is still WIP. Also fix up ColumnStepsType* on ScreenHighScores. 2009-12-03 02:41:36 +00:00
AJ Kelly 7062e29953 replace LifeMeterBattery frame to match the theme 2009-11-23 06:08:33 +00:00
AJ Kelly b0703857ab fix a crash when entering ScreenSelectCourse. 2009-11-23 05:58:36 +00:00
AJ Kelly bf422c667b add more info to Profile, GameState; add GameManager, ScreenEvaluation 2009-11-17 18:50:20 +00:00
AJ Kelly feddb05b1b remove unneeded loading.xpm from makefile 2009-11-16 05:53:16 +00:00
AJ Kelly 44e8c0db21 fix GAMESTATE:GetCurrentSteps description and argument list 2009-11-07 23:39:53 +00:00
AJ Kelly 79ae750c2e add NotesLoaderPMS 2009-11-06 05:56:06 +00:00
AJ Kelly a18a2b71f8 fix RemoveCardP1/2 not having OnCommands in ending screens. 2009-11-02 23:43:19 +00:00
AJ Kelly c42366c642 fix a crash with songs that have an Edit chart as the only difficulty. 2009-11-02 19:47:45 +00:00
AJ Kelly 0d4ef04621 add support for BLEND_WEIGHTED_MULTIPLY and BLEND_INVERT_DEST in d3d 2009-09-13 07:08:31 +00:00
AJ Kelly effb2bb06a remove CatalogXml from older Visual Studio project files 2009-08-30 18:59:36 +00:00
AJ Kelly 90000b6b56 add some more functions, clarify Steps:GetFilename() 2009-08-12 20:26:37 +00:00
AJ Kelly beade074a2 revert per 7114679; forgot about that one, sorry. 2009-07-02 21:17:39 +00:00
AJ Kelly b1275ef1c6 update ScreenSelectStyle when a player joins so that the correct styles are available. 2009-07-02 06:01:53 +00:00
AJ Kelly 795432c36c turns out Course:GetTotalSeconds() requires StepsType. whoops! 2009-06-13 06:31:02 +00:00
AJ Kelly 20b5325486 some more lua documentation additions 2009-06-06 20:20:20 +00:00
AJ Kelly 543d533f75 update lua docs 2009-06-06 08:05:38 +00:00
AJ Kelly 9891695451 add Lua bindings for GetError and Seek in RageFile 2009-06-05 05:55:59 +00:00
AJ Kelly c7e5edab5e course mode fixes on SelectMusic 2009-06-02 01:21:14 +00:00
AJ Kelly c6e6ad24ad fix crash that happened when LateJoin and Doubles for 1 Credit were enabled and Doubles was selected ("No compatible styles for [insert game and styletype] with 2 players.").
todo: The non-master player's CreditsDisplay still shows "Insert Card", unlike themes without LateJoin on. Not sure how to go about fixing this; hoped SetCurrentStyle(Style) would've done it but was not the case.
2009-05-23 05:59:41 +00:00
AJ Kelly 4efe131335 some logo redirects and fill in Crazy CustomDifficulty 2009-05-18 02:18:47 +00:00
AJ Kelly 8edb137dad fix small typo 2009-05-03 03:33:42 +00:00
AJ Kelly a84e00a39f add some missing elements (quick and dirty-like) 2009-05-02 00:24:15 +00:00