Sally Cochenour
1fac0505a4
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
# Conflicts:
# src/doomdef.h
2020-04-12 23:32:15 -05:00
Wolfy
0a50317e49
oops
2020-04-12 22:47:22 -05:00
Wolfy
c68e1c53f3
Fix off by one error in http downloader
2020-04-12 21:14:33 -05:00
Wolfy
bceeaf78bc
Prep stuff
...
pending asset hash changes
2020-04-12 20:48:11 -05:00
wolfs
dcfaba2cc6
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium
9293c6cb32
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
2020-04-12 17:56:12 -04:00
Steel Titanium
2dd7854a9b
Remove some of these superfluous ifdef checks.
...
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Wolfy
9c727992a4
Fix self-comparison in hw_main.c
2020-04-12 06:47:12 -05:00
Hannu Hanhi
f3bdcb4ec3
Backport from SRB2: Replace NextTexAvail with glGenTextures
2020-04-12 06:39:00 -05:00
wolfs
ee0bba26f4
Merge branch 'kill-these-please-12' into 'awful-mix'
...
Compiler errors, again, again
See merge request SinnamonLat/Kart-Public!5
2020-04-12 07:00:05 -04:00
James R
60a38cbec3
Even the warning can die, give the programmer some credit
...
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
2020-04-11 22:10:05 -07:00
James R
6d3f5ef163
Also allocate mipmap for MD2
...
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
2020-04-11 22:10:05 -07:00
James R
4ad360155f
Fix nonpacked to packed cast for OpenGL
...
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
2020-04-11 22:10:05 -07:00
James R
437f7aa16d
Fix misaligned pointers
...
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
2020-04-11 22:03:29 -07:00
Wolfy
da2a640c6c
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
8001bb4154
Batching!
2020-04-12 03:09:07 +03:00
Hannu Hanhi
1efa95bb33
Don't destroy my config file
2020-04-12 02:18:12 +03:00
Hannu Hanhi
3a654bb7d9
Fix comment
2020-04-11 13:27:18 -05:00
Hannu Hanhi
7bac42f9b2
Don't repeatedly look for texture files that don't exist. This fixes performance issues with models.
2020-04-11 13:27:17 -05:00
wolfs
516a4994f5
Merge branch 'fix-chat-draw-leak' into 'awful-mix'
...
Chat drawing memory leak fix from SRB2 repo
See merge request SinnamonLat/Kart-Public!4
2020-04-10 09:28:08 -04:00
Hannu Hanhi
b9e008c8bf
Chat drawing memory leak fix from SRB2 repo
2020-04-08 17:33:23 -04:00
wolfs
54472b5c22
Merge branch 'awful-mix' into 'awful-mix'
...
Fix lol xd compiler errors
See merge request SinnamonLat/Kart-Public!2
2020-04-08 17:04:06 -04:00
James R
4b68b41a31
Fix lol xd compiler errors
2020-04-07 17:06:20 -07:00
Steel Titanium
061e483df1
Fix error with travis
2020-04-07 19:48:39 -04:00
Steel Titanium
f28c53ea82
Fix this mistake
2020-04-07 19:27:20 -04:00
Steel Titanium
f4002f076e
Fix even more build errors
2020-04-07 19:14:27 -04:00
Steel Titanium
cb9004e4cf
Fix some build errors
2020-04-07 19:07:39 -04:00
Steel Titanium
6fcc06bf72
Support for http downloads
2020-04-07 18:22:29 -04:00
Wolfy
8a1f40b90f
Add PT_CLIENTCMD back to allowed packet types
...
Fixes unexpected CLIENTCMD prints
2020-04-07 07:09:51 -05:00
Wolfy
bbce134afa
Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix
2020-04-07 06:41:54 -05:00
Wolfy
95e7e59179
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
Wolfy
d4c69f137a
Fix unterminated #ifdef
2020-04-07 04:25:11 -05:00
Wolfy
bcfffefe43
Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix
...
Reimplements removed MusicPlus functions.
# Conflicts:
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_script.h
2020-04-07 03:41:26 -05:00
Wolfy
59df0c1187
Revert the removal of S_MusicExists
2020-04-07 02:56:45 -05:00
Wolfy
2406302911
Potentially fix join passwords
2020-04-05 18:57:47 -05:00
Wolfy
49a1037f6b
Revert "PT_CLIENTCMD test"
...
This reverts commit 78bc80fd49
2020-04-05 17:18:22 -05:00
Wolfy
78bc80fd49
PT_CLIENTCMD test
2020-04-05 17:01:40 -05:00
Wolfy
40f7d1b721
Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix
2020-04-05 16:12:04 -05:00
Wolfy
cedc79fd4b
Fix packet type desync
2020-04-05 16:11:30 -05:00
Wolfy
4d477d1aed
Reimplement the MusicChange hook
...
why the fuck was this removed
2020-04-05 12:09:44 -05:00
Wolfy
49842c37cd
Record attack only linedef exec
2020-04-05 14:12:12 +02:00
Latapostrophe
12bca93591
Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix
2020-04-05 14:10:00 +02:00
Sally Cochenour
88a6b6b2f4
Slow down backwards spikeballs (again)
2020-04-05 14:09:04 +02:00
Wolfy
9395a0f5fc
Record attack only linedef exec
2020-04-05 07:03:49 -05:00
Latapostrophe
b483e42d94
Merge branch 'v1-ignore-posthumous-ackret' into awful-mix
2020-04-05 11:23:49 +02:00
Latapostrophe
86986adf6e
Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret
2020-04-05 11:23:29 +02:00
Latapostrophe
732eb4cafa
Merge branch 'fix-double-bombs' into awful-mix
2020-03-22 13:09:06 +01:00
Latapostrophe
549eabe9e4
I'm dumb, don't check for flashtics here...
2020-03-22 13:08:46 +01:00
Latapostrophe
4f24f1ae5b
Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix
2020-03-13 22:38:20 +01:00
Latapostrophe
67eeb819cb
Merge branch 'fix-double-bombs' into awful-mix
2020-03-13 13:52:37 +01:00
