Commit Graph
33612 Commits
Author SHA1 Message Date
Jason Felds 1f58900f4f Merge pull request #24 from wolfman2000/wolf-tab-fix
...seriously? Xcode setting fix for tabs?

...sometimes I don't get these editors.
2014-02-03 17:58:39 -08:00
Jason Felds 65f0261292 ...seriously? Xcode setting fix for tabs? 2014-02-03 20:57:17 -05:00
Colby Klein 6a691a1c4a Spaces -> Tabs in Steps.cpp (Jason, fix your editor) 2014-02-03 16:17:30 -08:00
Jason Felds e6125e6daa Attempt to allow getting radar values without PN. 2014-02-03 18:49:17 -05:00
Jason Felds 20dc9af218 Missed this from last time. 2014-02-03 18:35:38 -05:00
Colby Klein 6129454f36 Merge branch 'wolf-editor-disable-tss' of https://github.com/wolfman2000/stepmania into wolfman2000-wolf-editor-disable-tss 2014-02-02 15:38:25 -08:00
Colby Klein a3de293a4d Add Pay mode back to debug menu 2014-02-02 15:35:48 -08:00
Ben "root" Anderson 3701197fd4 Add some localization things that Devin caught and I missed. 2014-02-02 13:37:37 -06:00
Ben "root" Anderson 332c6d3787 Merge branch 'master' of https://github.com/stepmania/stepmania 2014-02-02 12:58:07 -06:00
Ben "root" Anderson d654bd0142 Time to reopen this big 'ol bag of worms. 2014-02-02 12:53:26 -06:00
Jason Felds c4f8a9d834 Merge pull request #19 from wolfman2000/wolf-unified-xcode4
Fix Xcode 4 building, bring it back to one file.

dbk2 approves. Calling it as good then. If mistaken, make a new branch and prove it.
2014-02-01 20:34:23 -08:00
Jason Felds 2fe6144ea5 Prevent swap files from being added. 2014-02-01 23:08:34 -05:00
Jason Felds 264013aa58 Remove multiple duplicate entries. 2014-02-01 23:06:14 -05:00
Jason Felds 8e0ba01385 Ignore Xcode user specific files. 2014-02-01 22:49:23 -05:00
Jason Felds ae5af084e5 Unify into one 4.6.3 xcodeproj file. 2014-02-01 22:47:55 -05:00
Jason Felds 7ec8de6007 Fix vorbis first of all. 2014-02-01 22:34:16 -05:00
Colby Klein b09dd6650c Ignore .deps and .dirstamp (automake stuff) 2014-02-01 01:14:53 -08:00
Jason Felds 4919b7c28f Attempt to address issue #9 for SM5.
Not in best position to test out.
2014-01-29 18:12:10 -05:00
Colby Klein ecf91d651f Merge pull request #12 from wolfman2000/gitignore-sublime-text
Ignore sublime text projects/workspaces.
2014-01-29 14:57:37 -08:00
Jason Felds 938e3ba01d Ignore sublime text projects/workspaces. 2014-01-29 17:52:19 -05:00
Colby Klein 5a761f8613 Merge pull request #11 from wolfman2000/wolf-010-sync-charts
Issue 010: Add missing step sync types.
2014-01-27 19:26:34 -08:00
Jason Felds 3b9b4d1e36 Issue 010: Add missing step sync types. 2014-01-27 19:38:41 -05:00
Ben "root" Anderson ec081e772f Merge pull request #4 from cybik/dwindex
Some libc's require enum members to be part of a named enum to be used as indices for maps.
2014-01-26 18:58:28 -08:00
Renaud Lepage e0beb96d69 A namespace error was causing the Android compiler to choke. 2014-01-26 21:53:17 -05:00
Colby Klein 0a2fe0bff7 Merge pull request #3 from cybik/centralize
Centralize SpecialDirs.
2014-01-26 16:49:03 -08:00
Renaud Lepage 5cce28d8ab Corrected per project spec 2014-01-26 19:41:40 -05:00
Renaud Lepage e9226aedc4 Centralize SpecialDirs. 2014-01-26 19:14:41 -05:00
freem f1e5218658 [StatsManager] Added GetFinalEvalStageStats() Lua binding (sm-ssc v2 port) 2014-01-26 17:58:55 -06:00
freem 6ae71631d4 damnit TortoiseMerge (fix newline and crap) 2014-01-26 17:57:13 -06:00
freem 8a0c218282 [ScreenWithMenuElements] Added IsTransitioning() Lua binding (from sm-ssc v2) 2014-01-26 17:54:28 -06:00
freem b472bc37e4 [ActorScroller] Add GetSecondsPauseBetweenItems() Lua binding (sm-ssc v2 port) 2014-01-26 17:51:09 -06:00
Renaud Lepage b00016b94a Restore ignores properly in git. fixes #2 2014-01-26 18:26:49 -05:00
Renaud Lepage eca4ac793c Remove Mercurial ignores 2014-01-26 18:22:21 -05:00
Colby Klein 618a202d8f Merge pull request #1 from chrisdanford/master
Create README.md
2014-01-26 15:14:29 -08:00
Ben "root" Anderson 8f9a7efbb4 Added some sorely lacking filtering logic to EditMenu related to Practice mode. 2014-01-25 14:18:18 -06:00
Ben "root" Anderson a9ed54ae9b Don't rename EVERY difficulty of halfdouble. That's just silly. Medium is the one people actually use. 2014-01-25 12:46:11 -06:00
Ben "root" Anderson 970bb39a81 RageSoundDriver_JACK: Autoconnect by default. More robust port detection and connection logic. 2014-01-25 11:04:46 -06:00
Ben "root" Anderson 36864f8ae7 RageSoundDriver_JACK: Try to connect to the system playback ports if no SoundDevice was specified. 2014-01-25 10:16:26 -06:00
Ben "root" Anderson 5a78561806 Change Linux sound driver load order (reasons in comments) 2014-01-25 09:56:24 -06:00
Ben "root" Anderson fe91ae4b18 RageSoundDriver_JACK: Explicitly hint that we would rather fail than start a new jackd instance. 2014-01-25 09:55:45 -06:00
Ben "root" Anderson 6f499cb7e2 Typo 2014-01-22 00:43:18 -06:00
Ben "root" Anderson 5ee2c4c20c Fix a (probably very very rare) memory leak 2014-01-22 00:35:44 -06:00
Ben "root" Anderson 2ee216d061 ArchHooks_Unix: Implement GetClipboard() 2014-01-22 00:31:06 -06:00
Ben "root" Anderson 6dcbcd1d7b Oh no you don't. 2014-01-22 00:10:50 -06:00
Ben "root" Anderson 9538385a6a Remove misleading comment. The code is sit up for these to only be called once. 2014-01-21 23:02:10 -06:00
Ben "root" Anderson b1883f06c1 Hack around inconsistent pthread dep 2014-01-21 22:58:52 -06:00
Ben "root" Anderson 2164320354 Nuke another old unused arch thing 2014-01-21 21:52:38 -06:00
Ben "root" Anderson 0bb54f7c9c Unused header 2014-01-21 21:48:12 -06:00
Ben "root" Anderson 323e4752bb Nuke old unused arch infrastructure 2014-01-21 21:38:19 -06:00
Ben "root" Anderson 04079c0c1b Unused header 2014-01-21 21:36:14 -06:00