AJ Kelly
0d309e633d
Merge pull request #506 from wolfman2000/wolf-without-network
...
Restore --without-network.
2015-03-10 17:01:27 -05:00
AJ Kelly
787bc0be3c
Merge pull request #468 from dguzek/OS-X-BundleScript
...
fix OS X bundle scripts
2015-02-13 10:19:42 -06:00
AJ Kelly
64b6487940
Merge pull request #410 from YungDaVinci/patch-1
...
Update 02 Actor.lua
2014-12-14 12:45:23 -06:00
AJ Kelly
65d39d7302
Merge pull request #365 from psmay/patch-1
...
en.ini: Fix "guage"
2014-11-06 15:57:50 -06:00
AJ Kelly
b668e9feeb
Merge pull request #333 from wolfman2000/wolf-version-b4b
...
Increment the version. Update the change log.
2014-10-15 20:13:42 -05:00
AJ Kelly
3f29a89e39
Merge pull request #329 from hanubeki/noteskin-var
...
Fix Var "Player" and Var "Controller" in non-receptor arrow.
2014-10-14 02:28:50 -05:00
AJ Kelly
b0ccfd71a5
Merge pull request #328 from hanubeki/notecolor
...
Add {PartName}NoteColorType and {PartName}NoteColorCount NoteSkin metric.
2014-10-11 17:26:19 -05:00
AJ Kelly
de36029650
Merge pull request #286 from dguzek/OSX-bundle-script
...
update OSX mkrelease scripts
2014-08-31 22:47:12 -05:00
AJ Kelly
594e4d2dfb
Merge pull request #274 from sigatrev/loop-wrap
...
revert ActorScroller "loop" behavior and add new "wrap" parameter to wrap scrollers
2014-08-25 23:30:38 -05:00
AJ Kelly
e2edf2a314
Merge pull request #256 from kyzentun/NoteskinClearFix
...
Fix crash when "clearall" is used.
2014-08-07 21:25:16 -05:00
AJ Kelly
ab61c11606
Merge pull request #255 from sigatrev/SyncMachine
...
fix ScreenGameplaySyncMachine crash
dear github: our travis build is broken in a pretty serious way (The command "sudo apt-get install libc6-dev" failed and exited with 100), and I know this isn't travis-support nor the right place for it but I thought I should let someone outside of IRC know the reason for it thanks
2014-08-07 18:38:31 -05:00
AJ Kelly
df5765c48a
Merge pull request #251 from sigatrev/MusicSpeed
...
maintain music rate speed adjust after music has finished
2014-08-02 14:01:07 -05:00
AJ Kelly
52ed5c3f55
Merge pull request #245 from sigatrev/ActorScroller
...
fix ActorScroller wrapping
2014-07-26 19:27:34 -05:00
AJ Kelly
020b3916e8
Merge pull request #233 from sigatrev/StringToDifficulty
...
add OldStyleStringToDifficulty method
2014-07-22 17:54:36 -05:00
AJ Kelly
8483e4c8b0
Merge pull request #232 from sigatrev/SavePrefs
...
SavePreferences. looks harmless enough to me!
2014-07-22 16:56:41 -05:00
AJ Kelly
305e80a08b
Merge pull request #230 from sigatrev/GameSoundManager
...
add SOUND:IsTimingDelayed method and fixed SOUND:PlayMusicPart
2014-07-19 15:35:47 -05:00
AJ Kelly
6104c3f6d4
Merge pull request #220 from spigwitmer/busted-without-ffmpeg
...
Fixes issue #216 : Cannot build with --without-ffmpeg
robo puppy mistreatment alert
2014-07-10 21:06:11 -05:00
AJ Kelly
d9dc82e9d6
Merge pull request #210 from kyzentun/HeartCalories
...
Heart calories
2014-07-01 10:58:57 -05:00
AJ Kelly
fffcdd08e6
Merge pull request #208 from kyzentun/AutoSetStyleInSetCurrSteps
...
AutoSetStyle convenience
2014-06-27 22:16:27 -05:00
AJ Kelly
0b7ca07576
Merge pull request #199 from kyzentun/RateCompensation
...
Changed GetYOffset to make CMods an MMods compensate for music rate.
2014-06-23 14:53:24 -05:00
AJ Kelly
bc93c01021
Merge pull request #194 from sigatrev/Dark
...
Better fix of float Dark
2014-06-15 15:43:26 -05:00
AJ Kelly