Steel Titanium
|
80d1181cff
|
Fix mangled comment
|
2019-04-22 19:27:42 -04:00 |
|
Steel Titanium
|
3e838c1e83
|
New IntermissionThinker hook
|
2019-04-22 00:29:47 -04:00 |
|
Sal
|
ac2bce0a3e
|
Merge branch 'fix-function-typo' into 'next'
Lua: fix K_PlayPowerGloatSound mistype
See merge request KartKrew/Kart-Public!122
|
2019-04-11 12:06:33 -04:00 |
|
Sal
|
a1e4748a68
|
Merge branch 'patch-1' into 'next'
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
See merge request KartKrew/Kart-Public!119
|
2019-04-11 12:05:59 -04:00 |
|
Lachlan Wright
|
bc2f78020b
|
Update k_kart.c
|
2019-04-10 03:16:46 -04:00 |
|
Steel Titanium
|
13bfbac72b
|
Lua: fix K_PlayPowerGloatSound mistype
|
2019-04-06 21:59:58 -04:00 |
|
Alam Arias
|
dc11f9b371
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-27 19:13:41 -04:00 |
|
Alam Ed Arias
|
8d51de4993
|
CircleCI: use libpng-dev
|
2019-03-27 18:51:20 -04:00 |
|
Alam Ed Arias
|
af1682d758
|
CircleCI: Debian Jessie is dead, long live Debian Stretch
|
2019-03-27 18:23:03 -04:00 |
|
Lachlan Wright
|
40f351debb
|
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
|
2019-03-27 03:23:32 -04:00 |
|
Alam Arias
|
783f910d65
|
TravisCI: remove xcode7.3 on DPL mac build
|
2019-03-26 21:20:17 -04:00 |
|
Alam Arias
|
fea79d2185
|
mistype in merge of TavisCI config
|
2019-03-26 11:54:54 -04:00 |
|
Alam Arias
|
85b79ae822
|
Merge commit 'upstream/master~0'
|
2019-03-26 10:50:36 -04:00 |
|
Alam Arias
|
ef10d08db3
|
Merge commit 'upstream/master~1'
|
2019-03-26 09:48:13 -04:00 |
|
Monster Iestyn
|
0194922509
|
Merge branch 'buildbot' into 'master'
Buildbot changes
See merge request STJr/SRB2!477
|
2019-03-26 09:44:56 -04:00 |
|
Monster Iestyn
|
a1c30e3b6a
|
Merge branch 'dedicated-server-credits-fix' into 'master'
Dedicated server credits fix
See merge request STJr/SRB2!476
|
2019-03-26 09:44:21 -04:00 |
|
Monster Iestyn
|
8e51cad3d6
|
Merge branch 'mi-side-discolor-fix' into 'master'
MI's side discolor fix
See merge request STJr/SRB2!475
|
2019-03-26 09:43:20 -04:00 |
|
Monster Iestyn
|
9da1033467
|
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
|
2019-03-25 21:35:04 +00:00 |
|
Alam Ed Arias
|
e8a527b6dc
|
TravisCI: use stock sdl2_mixer for prebuild bottle
|
2019-03-25 16:59:47 -04:00 |
|
Alam Ed Arias
|
05d2dcca97
|
travisCI: add sdl2_mixer from mazmazz's srb2 tap
|
2019-03-25 16:43:33 -04:00 |
|
Alam Ed Arias
|
208a835479
|
TravisCI: install deps on sdl2_mixer
|
2019-03-25 16:30:02 -04:00 |
|
Alam Ed Arias
|
15dbe3730b
|
TravisCI: try updating homebew
|
2019-03-25 16:02:30 -04:00 |
|
Alam Ed Arias
|
e47bf6274f
|
TravisCI: build custom sdl2_mixer build
|
2019-03-25 15:51:13 -04:00 |
|
Alam Ed Arias
|
d69d834c6a
|
use default osx image
|
2019-03-25 15:48:33 -04:00 |
|
Alam Ed Arias
|
45c641204b
|
TravisCI: move homebrew packages for all mac builds
|
2019-03-25 15:44:33 -04:00 |
|
Alam Ed Arias
|
042b30c6e5
|
CircleCI: rebuild depend file with BLUA
|
2019-03-25 15:34:25 -04:00 |
|
Alam Ed Arias
|
17768854e0
|
P_SuperDamage() is too big for inlining
|
2019-03-25 15:30:25 -04:00 |
|
Alam Ed Arias
|
0fbca9a84b
|
CircleCI: also test compiling without BLUA support
|
2019-03-25 15:21:52 -04:00 |
|
Alam Ed Arias
|
853855eb69
|
Travis-CI: use a new version of xcode and use homebrew add-on to install packages
|
2019-03-25 15:16:43 -04:00 |
|
Monster Iestyn
|
fa3349a117
|
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
|
2019-03-25 18:54:47 +00:00 |
|
Alam Arias
|
212a2ecf5b
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-23 15:08:45 -04:00 |
|
Nev3r
|
64353bf373
|
Merge branch 'allow-localhost' into 'master'
Allow connecting to localhost / 127.0.0.1
See merge request STJr/SRB2!474
|
2019-03-23 05:16:44 -04:00 |
|
Alam Arias
|
0d63271c7a
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-22 10:42:07 -04:00 |
|
Alam Arias
|
d6da0b1b7f
|
Merge commit 'upstream/master~1'
|
2019-03-22 10:18:10 -04:00 |
|
Alam Arias
|
ce6353f7d3
|
Merge commit 'upstream/master~2'
|
2019-03-22 10:15:32 -04:00 |
|
James R
|
6939dca52a
|
Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
|
2019-03-20 20:37:00 -07:00 |
|
James R
|
25bd4a0876
|
Let localhost connections
|
2019-03-20 20:37:00 -07:00 |
|
Monster Iestyn
|
ce37e4c9c8
|
Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
|
2019-03-20 17:33:04 -04:00 |
|
Monster Iestyn
|
fa6f9062fe
|
Merge branch 'errorifpng' into 'master'
Error if the lump is a PNG lump
See merge request STJr/SRB2!466
|
2019-03-20 16:26:28 -04:00 |
|
Alam Ed Arias
|
94e29d1bb4
|
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
|
2019-03-19 09:10:25 -04:00 |
|
Alam Arias
|
edd8598628
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-19 01:05:54 -04:00 |
|
Alam Ed Arias
|
727d9cae23
|
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
|
2019-03-19 00:04:14 -04:00 |
|
Alam Ed Arias
|
4cb71746a7
|
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
This reverts commit 7d14342a8f.
|
2019-03-18 23:58:31 -04:00 |
|
Alam Ed Arias
|
7d14342a8f
|
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
|
2019-03-18 16:50:17 -04:00 |
|
fickleheart
|
5c6f142da1
|
LAT
|
2019-03-17 21:44:11 -05:00 |
|
Sryder
|
03f762bd56
|
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git
|
2019-03-17 22:59:08 +00:00 |
|
fickleheart
|
1a27ad4105
|
Merge branch 'version-prep'
|
2019-03-17 17:55:38 -05:00 |
|
Sryder
|
8d1372bec8
|
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
|
2019-03-17 22:54:28 +00:00 |
|
fickleheart
|
bd5c8f0ce5
|
Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep
|
2019-03-17 16:37:01 -05:00 |
|
fickleheart
|
6555802dc0
|
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
|
2019-03-17 16:36:52 -05:00 |
|