thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5159 commits 1 branch 12 tags 205 MiB
Commit graph

5159 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sal
d7303b1b2d Merge branch 'music-credits' into 'next' 
In-game music credits

See merge request KartKrew/Kart-Public!23
 2019-01-10 18:42:44 -05:00
TehRealSalt
dbc22fd87d Merge branch 'next' into music-credits 2019-01-10 01:14:02 -05:00
Sal
69bd4dccf7 Merge branch 'kmd2-fallback' into 'next' 
KMD2 Fallback

See merge request KartKrew/Kart-Public!22
 2019-01-10 01:04:04 -05:00
TehRealSalt
a1daaf339b Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way 2019-01-10 01:03:53 -05:00
TehRealSalt
6ac7e50d70 Remove this, doesn't work 2019-01-10 00:35:11 -05:00
TehRealSalt
66bb728363 Expose S_ShowMusicCredit to Lua 2019-01-09 21:17:24 -05:00
TehRealSalt
3491a22a94 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
171faa4ab4 Fix Music toggle trying to play a non-existent song in Kart 2019-01-09 21:13:06 -05:00
TehRealSalt
e05e543396 Accidental unselected change 2019-01-09 21:12:33 -05:00
TehRealSalt
6c5cc453a8 Show song credits if joining mid-game 
Dunno if this works or not yet!
 2019-01-09 21:01:56 -05:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
wolfy852
8f1617a4dc Missed a few spots 2019-01-09 15:53:59 -06:00
wolfy852
6943f59e79 If kmd2.dat isn't found in srb2home, search the game's directory for it 2019-01-09 15:38:37 -06:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
Sal
641ebaa5c6 Merge branch 'kart-public-travis-deployer' into 'next' 
Implement OSX and Debian installer building for Travis

See merge request KartKrew/Kart-Public!8
 2019-01-09 01:42:44 -05:00
Sal
569338a3a1 Merge branch 'drift-spark-adjustment' into 'next' 
Minimum speed to get drift sparks

See merge request KartKrew/Kart-Public!20
 2019-01-09 01:18:30 -05:00
Sal
2d81bcf0ba Merge branch 'kart-public-appveyor-improvements' into 'next' 
Add Windows installer building and 64-bit builds to AppVeyor

See merge request KartKrew/Kart-Public!7
 2019-01-08 21:20:51 -05:00
TehRealSalt
301477f212 Misc level init fixes 2019-01-08 20:14:58 -05:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05:00
Marco Z
6ed52d9c42 Kart Public Next merge 2019-01-08 18:39:11 -05:00
Sal
88c6150f7b Merge branch 'gamepad-tweaks' into 'next' 
Gamepad Improvements

See merge request KartKrew/Kart-Public!5
 2019-01-08 18:08:00 -05:00
wolfy852
2794833f8d Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
 2019-01-08 16:32:24 -06:00
Sal
900c6df765 Merge branch 'mobjscale-global' into 'next' 
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
 2019-01-08 17:00:34 -05:00
TehRealSalt
ab76725038 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
875f5eb28a Merge branch 'merge-srb2' into 'next' 
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
 2019-01-08 15:56:41 -05:00
Sal
85bdeb344e Merge branch 'animtimer-fix' into 'next' 
Cast animtimer to int before negating

See merge request KartKrew/Kart-Public!17
 2019-01-08 15:47:14 -05:00
Sal
530d50dcfc Merge branch 'makefile-develop' into 'master' 
Compile flag for DEVELOP

See merge request KartKrew/Kart-Public!18
 2019-01-08 15:45:04 -05:00
wolfy852
934b199705 Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
SeventhSentinel
9490d225de Minimum speed to get drift sparks 2019-01-06 17:17:52 -05:00
wolfy852
8baa538d43 Cast animtimer to int before negating 
Stops a Visual Studio compile error.
 2019-01-06 03:02:12 -06:00
Sal
02f49b2b8b Merge branch 'kill-facefreed' into 'next' 
Remove facefreed/iconfreed

See merge request KartKrew/Kart-Public!15
 2019-01-06 02:02:54 -05:00
SeventhSentinel
716ce5c343 Merge remote-tracking branch 'next' into merge-srb2 2019-01-06 02:02:33 -05:00
Sal
138c082de5 Merge branch 'load-order-adjustment' into 'next' 
Load sounds.kart after patch.kart

See merge request KartKrew/Kart-Public!13
 2019-01-06 01:51:41 -05:00
SeventhSentinel
3fe7856ba3 Keep execversion stuff on, just dummied out 
Had issues with skin values not changing from the menu, this seemed to fix it
 2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
wolfy852
600cf37c88 Remove facefreed/iconfreed 
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
 2019-01-05 20:40:47 -06:00
Sal
bb2a2ebf99 Merge branch 'unsigned-errors' into 'master' 
Fix unsigned abs errors

See merge request KartKrew/Kart-Public!14
 2019-01-05 20:49:06 -05:00
mazmazz
2a447f8800 Remove unnecessary version info call 2019-01-05 19:56:52 -05:00
mazmazz
0a40c19f7a Remove zlib from release brew packages 
(it was never in the original travis script)
 2019-01-05 19:50:46 -05:00
mazmazz
da0add55b0 Use standard OSX brew bottles to speed up test buildbots 2019-01-05 19:50:27 -05:00
mazmazz
8d86c537e0 OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs 2019-01-05 19:33:58 -05:00
mazmazz
3e52eb1de5 * Add homebrew tap mazmazz/srb2 
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
 2019-01-05 19:30:58 -05:00
mazmazz
c88299a81b Don't terminate in after_success because it halts the log abruptly 2019-01-05 19:30:57 -05:00
mazmazz
6da562f72f Revised comments 2019-01-05 19:30:54 -05:00
SeventhSentinel
e70d98d7a6 Merge remote-tracking branch 'srb2public/master' into merge-srb2 2019-01-05 18:42:58 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
SeventhSentinel
b9ea18c030 turn these signed before abs-ing em 2019-01-05 00:42:36 -05:00
SeventhSentinel
a595d0ba00 Load sounds.kart after patch.kart 2019-01-05 00:33:24 -05:00
Sal
09016c877d Merge branch 'mainwads-fix' into 'next' 
Don't increment mainwads for sounds or music.kart

See merge request KartKrew/Kart-Public!12
 2019-01-04 20:01:57 -05:00