Commit Graph
29626 Commits
Author SHA1 Message Date
Flameshadowxeroshin 873a60a9a3 fix what appears to be a FFMpeg blocker 2011-03-14 19:39:33 -05:00
Flameshadowxeroshin 067f5d967b once and for all 2011-03-14 19:35:09 -05:00
Flameshadowxeroshin 4efd7886ed fuckin merges reverted 2011-03-14 19:30:41 -05:00
Flameshadowxeroshin 96b90ee086 fuckin merges part 2? 2011-03-14 19:26:58 -05:00
Flameshadowxeroshin 6069920507 fuckin merges 2011-03-14 19:24:41 -05:00
Jason Felds 797d94c5b3 Right, overdid it there. 2011-03-14 17:55:07 -04:00
Jason Felds d59907e897 The future is now. sm124futures is brought in.
The changelog includes what was done.
2011-03-14 17:09:37 -04:00
Jason Felds 49f14d2b35 More warnings being taken care of. 2011-03-14 17:03:02 -04:00
Jason Felds 801f05d297 Let's see the merge diagram now, shall we? 2011-03-14 16:26:42 -04:00
Jason Felds 628a74a792 Effective C++ Violations down by over 5000.
I think that was the biggest batch.
2011-03-14 16:25:53 -04:00
AJ Kelly 3c5d57cec2 merge 2011-03-14 15:11:23 -05:00
Jonathan Payne 7168b07e40 glow em' bigga, dan 2011-03-14 13:10:28 -07:00
Jonathan Payne 4a04a84d4c kidnap themekit. 2011-03-14 13:08:48 -07:00
Jason Felds 8a7877f9d1 More warning fixes.
RageThreads.h is right now clear of
Effective Violations. It may be worth studying.
2011-03-14 15:30:04 -04:00
Jason Felds 68fe6b3a32 <Chuggaaconroy>NO!</Chuggaaconroy>
Do NOT force Effective C++ Violations on other Mac users.
2011-03-14 14:29:33 -04:00
Jason Felds b7a5fd9e90 More warning squishing.
Make a note of LuaManager: either define the needed items
or hide them away.
2011-03-14 14:26:29 -04:00
Jason Felds 99a6812fe5 merge? Merge? MEEEEEEEEEEEEEEEEEEEERGE! 2011-03-14 13:43:10 -04:00
Jason Felds 87b61d9bdc Thanks Xcode: force the YES/NO on me now. 2011-03-14 13:42:44 -04:00
Jason Felds 61d36671da Effective C++ violations being weeded out.
Not yet below 40K.
2011-03-14 13:40:38 -04:00
AJ Kelly f51fe3061e merging :| 2011-03-14 12:30:12 -05:00
Jason Felds c5fda59080 More warning reductions, even if not noticed.
We're in the lower 40Ks now with Effective C++
Violations being checked.
2011-03-14 12:15:33 -04:00
Jason Felds d03e6a89fb Got more of them, but not all.
Time to move onto a new file I think.
2011-03-14 11:14:29 -04:00
Jason Felds e090631b4c Make the others behave the same way.
Almost 10K warnings were removed from these two commits.

Can we find the others?
2011-03-14 10:50:39 -04:00
Jason Felds 33af1ba294 Fix some Effective C++ Violations.
This part may be easier to work with
from the command line at this rate...
2011-03-14 10:40:05 -04:00
Jason Felds d739e9a422 The nonbelievers have been purged. 2011-03-14 04:11:04 -04:00
Jason Felds 3fc85f6a58 Put in all warning checks for now.
Time to go back in time.
2011-03-14 03:41:37 -04:00
Jason Felds 81ccc7daba Quickly variables! Into the magic mirror! 2011-03-14 03:32:07 -04:00
Jason Felds e9df4832f6 Bring shadowed variables back from the dark side.
Alright Colby, happy now?
2011-03-14 02:54:11 -04:00
Jason Felds d855d8c7e8 Bring light into the shadow...variables.
Yeah, yeah, can't make a good joke at 2:30 AM.
2011-03-14 02:36:48 -04:00
Jason Felds 650653b4d2 Multiple warning fixes dealing with casts.
Yes, I am using static_casts. Generally safer.
2011-03-14 02:09:58 -04:00
AJ Kelly 66c8b06257 forgot to update the changelog after reverting. 2011-03-14 00:36:08 -05:00
Jason Felds 1dfb1c6143 Answer AJ's question. (comment update) 2011-03-14 01:34:10 -04:00
Jason Felds 3931a60f83 Bring it all together. 2011-03-14 01:21:59 -04:00
Jason Felds 4d074f3b81 Fix g++ warnings. 2011-03-14 01:21:30 -04:00
Jason Felds 8055d162fd Update .hgignore file from linux side. 2011-03-14 01:20:41 -04:00
Colby Klein c110f30f2a ...merge 2011-03-13 22:02:15 -07:00
Colby Klein f8f8a580fd Update year. 2011-03-13 22:01:46 -07:00
AJ Kelly caa04327b6 remove broken redirects 2011-03-13 23:18:17 -05:00
Jason Felds d4972e1c86 Update sm124futures with defaults 1.2.3. 2011-03-13 23:55:13 -04:00
AJ Kelly bfc129a9e2 changelog 2011-03-13 22:51:40 -05:00
AJ Kelly 66333aa6c0 sm-ssc v1.2.3 2011-03-13 22:50:43 -05:00
Flameshadowxeroshin 72d21bec63 we are now sm-ssc 1.2.3 2011-03-13 22:48:10 -05:00
Jason Felds 297c1943bf sm124futures: changelog. 2011-03-13 22:57:38 -04:00
Jason Felds 17299dd3be sm124futures: add directions to make rolls.
We may want to see about breaking this one up.
2011-03-13 22:56:30 -04:00
Jason Felds 247782b726 sm124futures: simplify attempt.
Caveat: recording mode is back to basics:
taps and holds. If demand is high, this can
be restored.
2011-03-13 22:45:19 -04:00
AJ Kelly ed72f533bd things still work with these commented out, but the libs still need to be there... 2011-03-13 21:33:01 -05:00
AJ Kelly 56f96a50d8 I guess it fixed whitespace 2011-03-13 21:32:11 -05:00
Jason Felds f951a87068 sm124futures: Working tap note cycling.
The code in NoteTypes could use a review:
perhaps the Type definition should be taken out of
the struct to try to make it more consistent?
2011-03-13 22:24:43 -04:00
AJ Kelly de77a3ac1f fix grade sorts too 2011-03-13 20:33:42 -05:00
AJ Kelly 919279938e Revert "Previously, we didn't create MusicWheel sorts when the screen loads"
This reverts commit 0dc297ba76508bb7244ed70f9f72761087e1f177.

It didn't work out so well.
2011-03-13 20:23:07 -05:00