Commit graph

7613 commits

Author SHA1 Message Date
Sally Cochenour
9483b72410 Forgotten / TICRATE 2020-04-25 21:33:34 -04:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Sal
c50670752a Merge branch 'prevent-div-by-zero' into 'master'
Prevent divide by zero in slopes code

See merge request KartKrew/Kart!243
2020-04-25 01:37:54 -04:00
Wolfy
9305cf7129 Remove cv_grskydome
This is how GL should've been handling skies all along, no point having an option
2020-04-24 23:48:03 -05:00
James R
48b7c75e47 Why is this still here 2020-04-24 20:39:54 -07:00
James R
4b2c13da0c Merge remote-tracking branch 'origin/master' into fof-things-suck 2020-04-24 20:36:30 -07:00
Sal
720ec3ba8a Merge branch 'scroll-back-and-front' into 'master'
Line special 507 - Scroll front and back textures of tagged lines by front and back texture offsets

See merge request KartKrew/Kart!239
2020-04-24 20:54:23 -04:00
Wolfy
98183fef6f Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Sally Cochenour
e26bb897d6 Prevent divide by zero in slopes code
Not exactly sure why this happens, or if this is the correct way to fix it
2020-04-23 14:18:43 -04:00
Sal
c53b09c48c Merge branch 'update-cmakelists' into 'master'
Add new files to src/CMakeLists.txt

See merge request KartKrew/Kart!242
2020-04-23 12:48:43 -04:00
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
Sally Cochenour
f920dd026d Minor things 2020-04-22 21:53:52 -04:00
Sally Cochenour
4bd88e47e3 Polishing turn stuff 2020-04-22 21:53:41 -04:00
Sally Cochenour
fb945ae523 Merge branch 'pet-robo' of https://git.magicalgirl.moe/KartKrew/Kart into pet-robo 2020-04-22 19:13:20 -04:00
Sally Cochenour
99cf835078 Improved banana usage 2020-04-22 19:13:14 -04:00
Hannu Hanhi
1e6444767e Fix mistake in previous commit 2020-04-22 23:50:50 +03:00
Hannu Hanhi
e4bbe42eec Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
Sal
dca2193121 Merge branch 'misc-camera' into 'master'
Camera tweaks

See merge request KartKrew/Kart!241
2020-04-22 16:42:19 -04:00
Sal
4a198c0bfa Merge branch 'version-change' into 'master'
No more modulo bullshit in VERSION

See merge request KartKrew/Kart!238
2020-04-22 16:41:17 -04:00
Sal
17e2cea517 Merge branch 'bananas-are-items' into 'master'
Move all of the item destroy sector code to one place

See merge request KartKrew/Kart!240
2020-04-22 16:40:56 -04:00
Sal
e23027d678 Merge branch 'let-there-be-var' into 'master'
Change netvars in replays

See merge request KartKrew/Kart!234
2020-04-22 16:40:29 -04:00
Sal
9671090d06 Merge branch 'distance-to-finland' into 'master'
More consistent finish line distance & positions

See merge request KartKrew/Kart!237
2020-04-22 16:40:19 -04:00
lachwright
4040698e24 Add new files to src/CMakeLists.txt 2020-04-22 23:24:25 +08:00
lachwright
dd126494b3 [Everyone disliked that.] (revert camera zoom) 2020-04-22 22:59:57 +08:00
wolfs
e1f33d903e Merge branch 'text-fixes-that-bother-me' into 'awful-mix'
Text fixes that bother me

See merge request SinnamonLat/Kart-Public!13
2020-04-22 03:28:41 -04:00
ThatAwesomeGuy173
3e37730545 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
59d7dfc753 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 01:01:08 -06:00
Wolfy
5b7ce81809 FUCKING- 2020-04-22 02:00:44 -05:00
ThatAwesomeGuy173
d3e19a3b09 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 00:48:09 -06:00
Wolfy
17236595e4 ASHNAL 2020-04-22 01:31:55 -05:00
ThatAwesomeGuy173
1bd3055937 Do the same for other messages too 2020-04-22 00:03:45 -06:00
ThatAwesomeGuy173
4c73e651cf Capitalize "record attack" as "Record Attack" and spell "addons" as "add-ons" in the replay hut 2020-04-22 00:01:03 -06:00
Wolfy
c40f1bf60d Shut the compiler up 2020-04-21 19:25:18 -05:00
Ashnal
abc17c9448 Fix dedicated servers not waiting for client wipes.
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
0467510b2e Don't crash if shaders are unavailable 2020-04-21 23:45:48 +03:00
Hannu Hanhi
b388239410 Remove sometimes harmful NetUpdate call from HWR_RenderFrame 2020-04-21 23:32:31 +03:00
Hannu Hanhi
1345f50c3d Fix wrong behaviour and lack of animation in ogl sky background 2020-04-21 23:24:32 +03:00
Hannu Hanhi
960014d2b8 Fix race results screen showing wrong image on maps with skyboxes 2020-04-21 23:23:03 +03:00
Hannu Hanhi
e569129b55 Newer color tinting shaders ported from SRB2 shader branch 2020-04-21 23:15:44 +03:00
Hannu Hanhi
761bca88fc Make OpenGL texture filter config save 2020-04-21 22:38:46 +03:00
Hannu Hanhi
f783e42556 Faster sprite sorting algorithm 2020-04-21 22:08:52 +03:00
James R
fd51bf10b0 Thing type 2003, MT_WAYPOINT_ANCHOR - Adjust waypoint's radius
The distance from the waypoint to the anchor will be the new radius.
2020-04-21 00:36:45 -07:00
James R
02f30814eb Do some cleanup 2020-04-21 00:35:06 -07:00
James R
ccf1bdcb29 Put botvars in savegame 2020-04-20 22:09:49 -07:00
wolfs
3e24c604c9 Merge branch 'packetversion-112' into 'awful-mix'
1.2 end game: PACKETVERSION support

See merge request SinnamonLat/Kart-Public!12
2020-04-20 23:55:39 -04:00
James R
b8942a5e68 SRB2APPLICATION: this is jart! 2020-04-20 20:22:17 -07:00
James R
6eae2b5243 Make the PACKETVERSION rule easier
(cherry picked from commit 4214397679c70a7910c82126783b434f0d10343e)
2020-04-20 20:22:04 -07:00
James R
6fd3d2641c Remove adminplayer from SERVERINFO (PACKETVERSION 2)
(cherry picked from commit 339ceafdf03a54cb562d70079f15587acd639619)
2020-04-20 20:22:01 -07:00
James R
2111cc2be6 More fine tuned versioning
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.

(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
2020-04-20 19:59:42 -07:00