wolfy852
|
dead0475ce
|
Allow any key to abort network connection, ignore non-keyboard keys in chat
|
2019-01-13 19:22:54 -06:00 |
|
wolfy852
|
31ccae60c9
|
Revert "Enable d-pad on the vote screen"
Partial revert of commit 92a60b32de.
|
2019-01-12 05:37:07 -06:00 |
|
wolfy852
|
622509682a
|
Fix chat toggle not working
|
2019-01-11 02:38:49 -06:00 |
|
wolfy852
|
d5e16dca63
|
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
|
2019-01-11 00:18:45 -06:00 |
|
Sal
|
45a1508f0a
|
Merge branch 'fix-chat' into 'next'
Fix splitscreen being forced into oldchat
See merge request KartKrew/Kart-Public!25
|
2019-01-10 18:43:14 -05:00 |
|
Sal
|
d726185f8e
|
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 |
|
wolfy852
|
6c4decfef3
|
Don't check splitscreen in OLDCHAT
|
2019-01-10 13:52:58 -06:00 |
|
wolfy852
|
92a60b32de
|
Enable d-pad on the vote screen, allow aborting connection with more joy buttons
|
2019-01-10 06:10:16 -06:00 |
|
wolfy852
|
73369679f5
|
Fix player 2 not being able to play while the chat is open
Also attempts to fix the d-pad typing characters into the chat box.
|
2019-01-10 06:08:12 -06:00 |
|
TehRealSalt
|
5b05eff41f
|
Merge branch 'next' into music-credits
|
2019-01-10 01:14:02 -05:00 |
|
Sal
|
41c32be673
|
Merge branch 'kmd2-fallback' into 'next'
KMD2 Fallback
See merge request KartKrew/Kart-Public!22
|
2019-01-10 01:04:04 -05:00 |
|
TehRealSalt
|
37e79ebfbd
|
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
|
9975497a68
|
Remove this, doesn't work
|
2019-01-10 00:35:11 -05:00 |
|
TehRealSalt
|
cff7d2795d
|
Expose S_ShowMusicCredit to Lua
|
2019-01-09 21:17:24 -05:00 |
|
TehRealSalt
|
d3a38a4375
|
Add disable for music credit showing on the change music linedef
|
2019-01-09 21:17:10 -05:00 |
|
TehRealSalt
|
2ccdd3e4b7
|
Fix Music toggle trying to play a non-existent song in Kart
|
2019-01-09 21:13:06 -05:00 |
|
TehRealSalt
|
ed36f5ac16
|
Accidental unselected change
|
2019-01-09 21:12:33 -05:00 |
|
TehRealSalt
|
565b8f87fb
|
Show song credits if joining mid-game
Dunno if this works or not yet!
|
2019-01-09 21:01:56 -05:00 |
|
TehRealSalt
|
de72403fb9
|
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
|
dbb7267f22
|
Missed a few spots
|
2019-01-09 15:53:59 -06:00 |
|
wolfy852
|
90148f79eb
|
If kmd2.dat isn't found in srb2home, search the game's directory for it
|
2019-01-09 15:38:37 -06:00 |
|
TehRealSalt
|
72bc1b48f6
|
Merge branch 'next' into music-credits
|
2019-01-09 03:08:20 -05:00 |
|
Sal
|
0a34d4bafa
|
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
|
2f30625c82
|
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
|
94ff7c33fd
|
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
|
5e8e08ad95
|
Misc level init fixes
|
2019-01-08 20:14:58 -05:00 |
|
Marco Z
|
7806c43ecf
|
Kart Public Next merge
|
2019-01-08 18:43:49 -05:00 |
|
Marco Z
|
20a117cfc7
|
Kart Public Next merge
|
2019-01-08 18:39:11 -05:00 |
|
Sal
|
e0f18f6d03
|
Merge branch 'gamepad-tweaks' into 'next'
Gamepad Improvements
See merge request KartKrew/Kart-Public!5
|
2019-01-08 18:08:00 -05:00 |
|
wolfy852
|
e528750444
|
Fix improperly resolved conflicts
|
2019-01-08 16:44:56 -06:00 |
|
wolfy852
|
ad01dcc5ac
|
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
|
78ac038864
|
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
|
b713903208
|
Merge remote-tracking branch 'master' into next
|
2019-01-08 16:29:14 -05:00 |
|
Sal
|
7f8609d335
|
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
|
6916667c41
|
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
|
82246f6c25
|
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
|
bcf687c3af
|
Compile flag for DEVELOP
|
2019-01-06 20:47:13 -06:00 |
|
SeventhSentinel
|
eebdda0833
|
Minimum speed to get drift sparks
|
2019-01-06 17:17:52 -05:00 |
|
wolfy852
|
e115dbf34f
|
Cast animtimer to int before negating
Stops a Visual Studio compile error.
|
2019-01-06 03:02:12 -06:00 |
|
Sal
|
7176490d5e
|
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
|
e545a8ab7d
|
Merge remote-tracking branch 'next' into merge-srb2
|
2019-01-06 02:02:33 -05:00 |
|
Sal
|
50a6df7563
|
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
|
8736952aad
|
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
|
49f2d65e95
|
Fix errors from merge
|
2019-01-06 01:00:30 -05:00 |
|
wolfy852
|
aa3c058321
|
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
|
4a3ea6e51e
|
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
|
2e9b18669a
|
Remove unnecessary version info call
|
2019-01-05 19:56:52 -05:00 |
|
mazmazz
|
c7725525a8
|
Remove zlib from release brew packages
(it was never in the original travis script)
|
2019-01-05 19:50:46 -05:00 |
|
mazmazz
|
1e19ba8570
|
Use standard OSX brew bottles to speed up test buildbots
|
2019-01-05 19:50:27 -05:00 |
|
mazmazz
|
e7dc346a10
|
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
|
2019-01-05 19:33:58 -05:00 |
|