Commit Graph
31122 Commits
Author SHA1 Message Date
AJ Kelly 6dc2de97fb use sm5 not ssc 2011-07-03 18:30:25 -05:00
AJ Kelly 6a16952161 FUCK THIS PIECE OF BULLSHIT 2011-07-03 17:52:03 -05:00
AJ Kelly 9241a4b1cb go away semicolons 2011-07-03 17:42:14 -05:00
AJ Kelly 16fa62327a add waiei to credits 2011-07-03 16:52:59 -05:00
AJ Kelly 38c4762108 first merge I've had to do in a while... 2011-07-03 16:49:43 -05:00
AJ Kelly be7de66481 once more with feeling 2011-07-03 16:49:21 -05:00
Jason Felds 27fee72ee8 Gotta love late merging. 2011-07-03 17:48:23 -04:00
AJ Kelly 69f236c9aa fix up credits in default 2011-07-03 16:48:14 -05: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
AJ Kelly 0ce0cdfefd kill bad redirect and be crazy because I can 2011-07-03 16:42:35 -05:00
AJ Kelly ffb6144456 slightly edit assert msg 2011-07-03 16:38:24 -05:00
Jason Felds dce018b051 Consistent offset. 2011-07-03 16:40:53 -04:00
Jason Felds 55df3a92ff Again, we merge. 2011-07-03 16:35:10 -04:00
Jason Felds 0cd794f778 Be consistent with pump couple edit. 2011-07-03 16:34:45 -04:00
AJ Kelly 86a853027e add songs to installer, add instructions to songs folder 2011-07-03 14:12:01 -05:00
Jason Felds 3115b5a438 Need eyes for couple edit stuff. 2011-07-03 15:10:00 -04:00
Jason Felds 38d84b45f5 Revert, restore Couple_Edit. 2011-07-03 14:50:05 -04:00
Colby Klein 731c9dcf64 merge again 2011-07-03 11:38:20 -07:00
Colby Klein 7240212b39 Fix lua error when using Rave mode 2011-07-03 11:37:51 -07:00
Jason Felds ab7fd7c1fc Remove outdated comment. 2011-07-03 14:30:54 -04:00
Colby Klein 58fa4ef2c4 Only show DP for active players. 2011-07-03 11:28:00 -07:00
Colby Klein 6082f77a5f merge 2011-07-03 11:03:17 -07:00
Colby Klein f63fa335f2 Slightly faster default CMods (250, 450). 2011-07-03 11:01:53 -07:00
Jason Felds 0e9a373816 Wow...that's a lot of fish^H^H^H^HPSDs. 2011-07-03 13:58:13 -04:00
Jason Felds b115a875de Fix the other mMod corner case. 2011-07-03 13:57:22 -04:00
AJ Kelly 3c426c6ee2 move these out of the way so the install size isn't so damn big 2011-07-03 12:49:36 -05:00
Jason Felds 91e8758e54 Pump steps for built-in songs.
Everyone thank Vin.il for them!
2011-07-03 13:47:38 -04:00
Jason Felds 26190ef547 And one more merge for good measure. 2011-07-03 13:43:46 -04:00
Jason Felds 2038606a30 New metric, MModHighCap. Can fix Tsuhsuixamush.
Set to 0 or less to remove the cap.
2011-07-03 13:43:30 -04:00
AJ Kelly 047f36ebc0 no, get the fuck out of here. 2011-07-03 12:35:59 -05:00
Jason Felds 1574de2c25 Deal with corner case.
The hardcoded 600 will soon become a metric.
2011-07-03 13:35:00 -04:00
Jason Felds b9e267c0b0 ...woah. Missed a lot this time. 2011-07-03 13:16:08 -04:00
Jason Felds b84fa62579 Tag team by freem and myself: mmods working 90%.
The remaining 10%? Dealing with Tsuhsuixamush.
2011-07-03 13:15:31 -04:00
AJ Kelly bbfbd35bd9 new icon 2011-07-03 11:25:09 -05:00
AJ Kelly 89ad03b5e3 make this red so I don't have to ever again 2011-07-03 11:15:59 -05:00
AJ Kelly 2abdbae80f semicolons, not commas 2011-07-03 10:43:08 -05:00
AJ Kelly 10eb50d93e pedantic crap 2011-07-03 10:41:44 -05:00
AJ Kelly 6eece06331 hopefully try and fix issue 268 but I didn't test these yet 2011-07-03 10:40:57 -05:00
AJ Kelly 0b8fea7146 why was this named noteskin.ini? 2011-07-03 10:40:06 -05:00
AJ Kelly b13d469101 getting ready for preview 2... 2011-07-03 10:32:31 -05:00
Jason Felds b15322a87a Most issues fixed for MMods.
Present problem: trying to assign the scroll
speed in a "read only structure". Is mPlayerOptions.GetCurrent()
a set in disguise?
2011-07-03 10:26:00 -04:00
Colby Klein 07a2bd6da7 Port OpenITG's M-Mods. Example: m600 to set target BPM of 600, on a 200BPM song this means 3x. Works with custom speed mods. Note: the block in Player.cpp needs to be fixed for these to be usable, do this before releasing PR2. 2011-07-03 00:08:56 -07:00
AJ Kelly 544f927932 [ScreenEdit] Fixed a crash when hitting Enter in the F1 help menu. 2011-07-02 18:54:07 -05:00
Jason Felds ca4080f9fd Don't hate the lifts. 2011-07-02 00:26:54 -04:00
Jason Felds 7237b8a249 Fix score sysem.
...err, system.
2011-07-02 00:09:52 -04:00
Jason Felds 31f209ff64 Revert language comment commit, fix bug.
It wasn't due to the comments it seems.
2011-07-02 00:05:14 -04:00
Thai Pangsakulyanont 9a1a824f22 let SpeedSegment scale itself.
also fixes the bug where the segments outside of the scaling region are scaled too.
2011-07-01 22:40:57 +07:00
Jason Felds 25ffddeb70 English comments please.
Perhaps someone can better translate what was erased?
2011-07-01 02:05:49 -04:00
Alberto Ramos 931b602502 metric thing 2011-06-30 22:51:02 -06:00
Jason Felds 906c36137c Simplify. 2011-06-30 14:39:57 -04:00