Commit Graph
32980 Commits
Author SHA1 Message Date
Jason Felds c8f8d6c459 Revert "war on -Werror, part 9: static inline > macros."
This reverts commit d080c38196.

...partly. Still have to adjust things.
2012-12-27 21:36:58 -05:00
Jonathan Payne 380bce948e Merge 2012-12-27 18:25:26 -08:00
Jonathan Payne 133a903907 Theme changes 2012-12-27 18:25:08 -08:00
Colby Klein 1ffd4d6527 Revert "remove PlayerStageStats.SetScore and SetCurMaxScore."
This reverts commit 9ecacf742e.
2012-12-27 18:02:56 -08:00
Devin J. Pohly bd0e2074ad replace ASSERT(0) with useful fail messages 2012-12-27 16:59:35 -05:00
Devin J. Pohly 376056a0cf fix file/line numbers in ASSERT_M/FAIL_M 2012-12-27 13:52:49 -05:00
Jason Felds a15cbc431d War on -Werror, part 14: More hodgepodge. 2012-12-27 12:45:04 -05:00
Jason Felds 52df8ea981 War on -Werror, part 13: hodgehodge. 2012-12-27 12:07:02 -05:00
Jason Felds 1fc16698ba War on -Werror, part 12: explicit bool usage.
It may save a few cycles, but it's best to be
explicit on boolean operations, especially with
ASSERT.
2012-12-27 11:38:53 -05:00
Jason Felds bddbed7e7e war on -Werror, part 11: const int -> float loss.
Had to work around the inline static const int rule
to do it, but at least there is no data loss now.
2012-12-27 11:13:41 -05:00
Jason Felds e86aeb66a8 war on -Werror, part 10: more informals. 2012-12-27 11:01:51 -05:00
Jason Felds d080c38196 war on -Werror, part 9: static inline > macros.
At least, according to the new wisdom of today.
2012-12-27 11:00:06 -05:00
Jason Felds e01537405f war on -Werror, part 8: more informals.
General guide: if the parameter name and its typings
match almost exactly, the name goes away.
Otherwise, it's commented out to allow for some
documentation.
2012-12-27 00:00:28 -05:00
Jason Felds 4f07a0ea8b war on -Werror, part 7: start informal params.
I'm preserving our numbering Pohly. ;)
2012-12-26 23:23:59 -05:00
Devin J. Pohly 7f4e97d72a fix one more unused warning 2012-12-26 23:08:51 -05:00
Jason Felds 2ad71548b8 war on -Werror, part 5: win macro redefinition.
Replaces commit 70b8f34.
2012-12-26 22:44:08 -05:00
Devin J. Pohly 1acbf07466 war on -Werror, part 4: miscellany 2012-12-26 21:45:45 -05:00
Devin J. Pohly 58aa480016 war on -Werror, part 3: narrowing conversions 2012-12-26 21:12:12 -05:00
Devin J. Pohly 7aac8c5ae3 war on -Werror, part 2: unused variables and dead code 2012-12-26 20:35:02 -05:00
Devin J. Pohly 1f80e3be4c remove code in ScreenGameplay that doesn't do anything 2012-12-26 20:15:56 -05:00
Devin J. Pohly d45afb73d8 war on -Werror, part 1: constructor order, c++ actually cares 2012-12-26 20:14:40 -05:00
Colby Klein 654be77960 Merge. 2012-12-25 21:48:22 -08:00
Colby Klein 55030a24da Fix lua error on ScreenStageInformation 2012-12-25 21:47:40 -08:00
Colby Klein 67371879a5 Fix score position on gameplay so difficulty is not on top of it. 2012-12-25 21:47:28 -08:00
Flameshadowxeroshin 0a0de2a140 and the changelog. 2012-12-25 23:36:28 -06:00
Flameshadowxeroshin ef8c64a2e8 docs too 2012-12-25 23:25:52 -06:00
Flameshadowxeroshin 9ecacf742e remove PlayerStageStats.SetScore and SetCurMaxScore. 2012-12-25 23:22:02 -06:00
Colby Klein ee34471cb6 Add Mark Seymour to credits. 2012-12-25 11:48:46 -08:00
Colby Klein 6453802639 Bump version to beta 1. 2012-12-25 11:36:06 -08:00
Colby Klein 93ac5d2bc8 Update changelog. 2012-12-24 16:16:05 -08:00
Colby Klein 5378173b5a Fix math.random() never returning > 0.5.
All the credit goes to vyhd for both breaking and fixing this.
2012-12-24 15:52:28 -08:00
Colby Klein e856d42dbc Reloading in the debug menu no longer crashes.
I don't know why it was ever set to reset the game - left it commented in case
this really breaks something I didn't notice, but now it's actually possible
to quickly test different MusicWheel transforms.
2012-12-24 02:21:11 -08:00
Flameshadowxeroshin a00ce73dd3 fix Final Stage not appearing on StageInformation if a Long or Marathon song is played as the last song; add Song:GetStageCost() 2012-12-18 21:35:54 -06:00
Colby Klein bfba3a6fe8 (mostly) Fix arrow stuttering from repeated positions from audio drivers.
As far as I could tell, this fixed any issues I was having with PulseAudio,
it should also fix up DSound on Windows although I've yet to test that.
2012-12-17 16:43:31 -08:00
Colby Klein d72bf7ecbb Fix an SMO crash when a song is using non-roman song titles. Taken from OITG,
it's definitely not the _right_ fix, but it'll do the job.
2012-12-17 01:07:24 -08:00
Colby Klein fb0e47b98f Bring over various texture related functions from the other renderer and a (if 0'd) GL3 compatible version of the extension pretty printing. 2012-12-13 16:11:03 -08:00
Colby Klein c57365d68a Hopefully fix windows build 2012-12-11 07:56:17 -08:00
Colby Klein d61a5fd1b1 Implement SetCullMode for GLES2. 2012-12-11 07:56:08 -08:00
Colby Klein 9adc995aa6 Remove RageDisplay_Legacy stuff for now. 2012-12-09 03:17:08 -08:00
Colby Klein 97ebf4b4e2 Current progress of the OpenGL ES 2.0 renderer. Uses a regular GL context currently, just limited to ES2 functionality. Don't bother trying to use it yet. 2012-12-09 03:05:54 -08:00
Colby Klein c8bbaf6eaa Other platforms have more than one renderer now. 2012-12-09 03:03:58 -08:00
Colby Klein d5bb1122b1 Fix compile on some systems (does this work on windows? will patch if I see buildbot problems) 2012-12-09 03:02:19 -08:00
Colby Klein 8146ced92a Load up GLES2 renderer if specified in Preferences 2012-12-09 03:01:38 -08:00
Colby Klein 60cede24fe Add GLES2 files to Makefile and configure.ac (compile with --without-gles2 if you don't want to build it; it doesn't hurt anything though) 2012-12-09 03:01:08 -08:00
Colby Klein a6020c8b1d Shut up the PIUIO driver from leaving a warning all the time. 2012-12-09 02:45:41 -08:00
Colby Klein 83f745f95c Add comments. 2012-12-09 02:45:19 -08:00
Marcio Barrientos 072f096214 Only unchose steps if menutimer have more than 10 seconds, twoparttimerseconds and allowing to unchose the song makes a "infinite timer" bug 2012-11-26 15:16:00 -06:00
Flameshadowxeroshin 8151c86de4 whoops 2012-11-23 23:05:19 -06:00
Flameshadowxeroshin d6f3ebd396 Patch 32 lines of goodness (attempt) 2012-11-23 22:59:45 -06:00
Alfred Sorenson d38bba1706 lua documentation update 2012-11-22 13:29:36 -06:00