actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,074 Commits 3 Branches 0 Tags
cd2bb9df3503ab1a66f8f563376a50b0e4f6eb59
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AJ Kelly cd2bb9df35 NextSong/PrevSong now work when TwoPartSelection=true + TwoPartConfirmsOnly=true on ScreenSelectMusic. A new message ("TwoPartConfirmCanceled") was added to catch when this happens. 2010-04-03 14:56:31 -05:00
AJ Kelly 9e019c194f okay it turns out there's another booboo: BackgroundCache was still referenced in here. (another "should've been in public beta 2" commit) 2010-03-31 19:32:50 -05:00
AJ Kelly cb73cce8a6 forgot some metrics changes. (this should be a part of v1.0 public beta 2) 2010-03-31 18:43:38 -05:00
AJ Kelly f27015e9dd attempt to silence a warning (let the post-public beta 2 commits begin!) 2010-03-31 18:36:10 -05:00
AJ Kelly 642f4b107c the various changes that I forgot to commit (cleanup and so forth) into hg, 
culminating in syncing with sm-ssc v1.0 public beta 2
 2010-03-31 17:37:09 -05:00
AJ Kelly b279635401 combination NSIS and Luadoc update 2010-03-30 15:56:28 -05:00
AJ Kelly 31dfd1847f replace old misc font page with new one 2010-03-30 13:11:23 -05:00
AJ Kelly f1604ac0bb and also add venacti bold 15px for _portKit-sm4 2010-03-30 00:41:09 -05:00
AJ Kelly 0aed16954a add venacti bold 24px to _portKit-sm4, since some themes (sup PARASTAR) use it. 2010-03-29 23:51:49 -05:00
AJ Kelly feb3d5104d add [ScreenSelectMusic] TwoPartTimerSeconds metric 2010-03-28 13:46:42 -05:00
AJ Kelly bdeb114a09 [Player combo] Diffuse to White instead of player color. P1's color is Red, conflicting with misses (which are also Red). 
[03 Gameplay] Renamed HoldJudgment commands to match the metrics names. Turned off fail combo in dance mode.
[metrics] re-hooked up HoldJudgment commands in Lua
 2010-03-28 13:07:33 -05:00
AJ Kelly c7120dd40b whoops, looks like this should've been a float. 2010-03-28 12:55:34 -05:00
AJ Kelly f60901b2d6 f008761: Don't call GetFirstCompatibleStyle if numSidesJoined == 0 (ScreenContinue) [Chris Danford] 2010-03-28 11:12:59 -05:00
AJ Kelly effacdb017 so long old backgroundcache code 2010-03-28 11:10:22 -05:00
AJ Kelly e9bfb25a97 smaller difficultylist [Midiman] 2010-03-27 18:30:50 -05:00
AJ Kelly f68943191e Turns out this multiple toasty trigger thing is causing more problems than it solved. Back to the old implementation of a single toasty trigger for now. 
update credits.
 2010-03-27 10:27:52 -05:00
AJ Kelly 4bbc834a8c Attempt to fix MenuTimer-related warning dialogs that come up when changing themes (happens when one theme's warning timer starts higher than another, and the other theme doesn't define it). 2010-03-26 01:38:07 -05:00
AJ Kelly f5eb67f7fe update changelog 2010-03-26 01:16:35 -05:00
AJ Kelly 4bd7076334 Mostly cleanup, but allow lines starting with ';' in .ini files to be treated as comments. 2010-03-26 01:02:49 -05:00
AJ Kelly 50aa3e141e add BPMDisplay::VariousText to metrics 2010-03-26 00:55:41 -05:00
AJ Kelly 89ad0796e7 [BPMDisplay] make the "Various" text a theme-able string. 2010-03-26 00:53:04 -05:00
AJ Kelly 961433cdef Fix a crash caused when switching themes in-game. Technical reason: It was choking on the song group colors, which weren't reloaded on theme switch before. 2010-03-26 00:45:29 -05:00
AJ Kelly bfa8f30d4e documentation updates 2010-03-24 21:40:55 -05:00
AJ Kelly 554336543e various theme changes 2010-03-24 18:44:35 -05:00
AJ Kelly eb2af8f169 more theming documentation updates 2010-03-23 03:17:06 -05:00
AJ Kelly d0b7a44adc update font .ini documentation 2010-03-23 03:02:10 -05:00
AJ Kelly 74e1315c08 Add conditional music documentation 2010-03-23 02:54:00 -05:00
AJ Kelly 61013c373b sigh. 2010-03-21 20:11:01 -05:00
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 e79835ee78 theme changes from Midiman 2010-03-20 23:45:18 -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 8150b35b24 add some missing strings 2010-03-15 00:00:40 -05:00
AJ Kelly dca9182138 various cleanup and commenting 2010-03-14 19:46:05 -05:00
AJ Kelly cb52191666 update changelog, credits 2010-03-14 19:27:18 -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 5d549386e3 fix Player 2's Great count on ScreenEval 2010-03-12 17:14:39 -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
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