Commit Graph

28008 Commits

Author SHA1 Message Date
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
Nicole Reid 6f774791bd Add freedesktop.org desktop entry and icons for UNIX systems.
added icons/hicolor/128x128/apps/stepmania-ssc.png
added icons/hicolor/16x16/apps/stepmania-ssc.png
added icons/hicolor/192x192/apps/stepmania-ssc.png
added icons/hicolor/22x22/apps/stepmania-ssc.png
added icons/hicolor/24x24/apps/stepmania-ssc.png
added icons/hicolor/256x256/apps/stepmania-ssc.png
added icons/hicolor/32x32/apps/stepmania-ssc.png
added icons/hicolor/36x36/apps/stepmania-ssc.png
added icons/hicolor/48x48/apps/stepmania-ssc.png
added icons/hicolor/64x64/apps/stepmania-ssc.png
added icons/hicolor/72x72/apps/stepmania-ssc.png
added icons/hicolor/96x96/apps/stepmania-ssc.png
added icons/hicolor/scalable/apps/stepmania-ssc.svg
added stepmania-ssc.desktop
2010-02-18 14:57:54 -05: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
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 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
Jason Felds c0d0269549 Exclude personal theme folders.
There needs to be a way to negate what's in this file.
AKA, exclude Themes, but include Themes/_fallback for instance.
2010-02-07 01:15:00 -05: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
Jason Felds f9b01e9c93 Intended fix: fix copyright symbol.
I was having it viewed as ? originally.
We need a better way to ensure UTF-8 is used
throughout our files.
2010-02-04 21:05:24 -05: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
Jason Felds 19a0444747 Fix encoding issue. 2010-01-31 21:06:02 -05: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
Jason Felds d56cb505d0 More pump specific items.
Note: not all of them seem to be working.
Rolls in particular will always cause an NG right now.
Assistance will be required.
Dance mode should be unaffected.
2010-01-30 15:22:28 -05: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
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
Jason Felds 23779974ec Simplify: not using variable except to return.
Also, auto auth push test.
2010-01-28 23:28:23 -05:00
Jason Felds 086c25224a Lineup. 2010-01-28 23:13:47 -05:00
Jason Felds 31a694abfe Force minimal time gain for survival.
Granted, don't think the course mode works yet.
2010-01-28 23:12:04 -05:00
AJ Kelly ee0f54a4ca cleanup 2010-01-28 20:48:37 -06:00
Jason Felds dd94b1e351 Ignore plist file. 2010-01-28 20:46:36 -05: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