Commit graph

6444 commits

Author SHA1 Message Date
TehRealSalt
93e844ecd2 Merge master
(We're still being haunted by whatever happened to make the entire k_kart.c file conflict every single time...)
2019-09-25 10:04:27 -04:00
TehRealSalt
bca4f30ee3 Use defines here instead
I got a "initializer element is not constant" error when compiling. From a quick Google search, it seems that const-type variables aren't totally considered constants in C. There may be a better way to fix this error.
2019-09-25 07:17:14 -04:00
Sal
002eecea47 Merge branch 'maps-pk3' into 'master'
Use maps.pk3

See merge request KartKrew/Kart!173
2019-09-24 02:46:10 -04:00
Sal
3eef46b06c Merge branch 'showhud' into 'master'
Treat ping and FPS counters like HUD

See merge request KartKrew/Kart!168
2019-09-23 20:32:27 -04:00
Sal
c7ed907e81 Merge branch 'rings_slopechange' into 'master'
Slippery Slopes

See merge request KartKrew/Kart!161
2019-09-17 00:47:53 -04:00
TehRealSalt
26e34a1fa1 Use maps.pk3 2019-09-16 03:04:26 -04:00
James R
094c926fd0 Apply hud translucency to FREE PLAY 2019-08-11 13:09:03 -07:00
James R
63abd92a0e Apply HUD translucency to ping and FPS counters 2019-08-11 12:35:06 -07:00
James R
de8030bc2e Toggle ping and FPS counters with HUD 2019-08-11 12:32:57 -07:00
Sryder
0006ceac88 Remove stray CONS_Printf 2019-08-11 18:37:18 +01:00
Sryder
0f7a704444 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/p_spec.c
2019-08-10 11:41:49 +01:00
Sryder
f7f27199a6 Merge branch 'no-credit-on-scores' into 'master'
Don't draw song credit over scores HUD

See merge request KartKrew/Kart!162
2019-07-17 16:46:24 -04:00
James R
14235ecb74 Really just the scores HUD 2019-07-17 13:41:43 -07:00
James R
1b74665259 Just don't draw song credit 2019-07-17 13:38:38 -07:00
Sryder
0767f4b8aa Merge branch 'public-master' into 'master'
Changes in public master

See merge request KartKrew/Kart!163
2019-07-17 16:27:32 -04:00
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
James R
e123b2acd7 Stop drawing after the scores hud 2019-07-17 12:29:10 -07:00
Sryder
316c7fe7ee Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-07-17 20:23:30 +01:00
Sal
e9cd3073e0 Merge branch 'upside-down-rings' into 'master'
Correctly animate rings in reverse gravity

See merge request KartKrew/Kart!159
2019-07-17 15:15:41 -04:00
Sryder
ad034a083b Merge branch 'copy-slope-thing-spawning-backport' into 'master'
Copy slope thing spawning fix backport

See merge request KartKrew/Kart!160
2019-07-17 15:14:44 -04:00
Nev3r
35ebe947c4 Things spawning over copied slopes now properly align on the new plane
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-07-17 12:04:14 -07:00
James R
d82e86d4cd Declare z in scope under case 2019-07-16 20:06:26 -07:00
James R
7354ce200e Correct reverse gravity offsets
Woah reverse gravity sucks.
2019-07-12 13:28:25 -07:00
Sryder
d6382107d3 Hopefully better Jawz behaviour
Moved the movement code for it out of the thinker and into A_JawzChase to have it all in a consistent place.
2019-07-07 21:56:23 +01:00
Sryder
fbc5b9f880 Added () for slight clarity 2019-07-07 15:24:32 +01:00
James R
c5bd4d6ecd Apply P_MobjFlip to ring and ring sparkle animations 2019-07-05 20:11:38 -07:00
Sryder
d6ec65de59 Added some slope handling for regular jawz.
Jawz as a result can absolutely behave differently, but it's mostly the case when in the range where it would slow down.
Will need testing, seems like it can sometimes rocket past a player that's stationary, maybe that's not a bad thing?
2019-07-05 23:29:31 +01:00
Sryder
893d8cd211 Support Jawz dud on slopes
Don't let orbinaut accelerate infinitely when in the air.
2019-07-05 21:11:13 +01:00
Sryder
de62209d96 Orbinaut supports slopes, slows down naturally when above top speed.
Still has it's speed reset lower when hitting a wall. Doesn't maintain slope speed increase.
2019-07-05 20:34:36 +01:00
Sryder
9beaac2e53 Merge branch 'fix-port-connect' into 'master'
Don't use client port as default peer port

See merge request KartKrew/Kart-Public!152
2019-07-05 11:54:28 -04:00
Sryder
8ac774a9d6 Merge branch 'add-floats-command' into 'master'
Fix the Add command when floats

See merge request KartKrew/Kart-Public!153
2019-07-05 11:49:46 -04:00
James R
460105cb8a Support adding to CV_FLOAT cvars with the Add command 2019-07-04 17:48:17 -07:00
James R
d4e950f17b Don't use client port as default peer port 2019-07-04 16:38:00 -07:00
Sryder
ae344fa2bc Fix silly issue 2019-07-04 17:55:41 +01:00
Sryder
e14da85868 Merge branch 'opengl_match_software_wallclip' into 'master'
OpenGL: Try and Match Software Wallclipping Better

See merge request KartKrew/Kart-Public!150
2019-07-02 14:08:10 -04:00
Sryder
19a2962413 Just remembered there's supposed to be a flag to determine if a waypoint can be spawned at 2019-06-30 22:14:20 +01:00
Sryder
658e852a0c Merge branch 'revert-mserv' into 'master'
Revert mserv

See merge request KartKrew/Kart-Public!144
2019-06-30 15:56:17 -04:00
Sryder
d579a40221 Merge branch 'replay-code-sucks' into 'master'
Fix SIGSEGV when saving replays and invalid extrainfo offset

See merge request KartKrew/Kart-Public!149
2019-06-30 05:51:21 -04:00
Sryder
20f8037351 Respawn at waypoints once first crossing the finish line. 2019-06-29 11:05:35 +01:00
Sryder
6eca35aae1 SPB Now follows the track.
You better watch out, You better watch out, You better watch out!
2019-06-28 22:43:34 +01:00
Sryder
10adecb4a6 Improvements to player finish distances
Figure out the circuit length on map load
player->distancetofinish is now a total distance on circuit maps
some hacky alterations around circuit finish lines to correctly calculate distancetofinish
2019-06-28 21:11:26 +01:00
Sryder
04966f5613 Add missing function header comments to k_waypoint.c 2019-06-28 09:59:19 +01:00
Sryder
269050ecc7 Merge branch 'lemme-outa-room-menu' into 'master'
Don't get stuck in room menu in a modified game

See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
Sryder
6a53837d2c Update Skywall handling
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +01:00
James R
78bd39acd5 Someone doesn't know how pointers or WRITE macros work...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
Sryder
913225dd2a checkforemptylines can be static 2019-06-24 20:50:37 +01:00
Sryder
06592383a0 Match CheckClip to software's clipping check in R_AddLine
Has the added benefit of fixing noclip camera for opengl
Unfortunately SkyWalls are kinda broken with this. I'll be looking into them shortly.
2019-06-24 20:21:30 +01:00
Sryder
d63c05a5aa Merge branch 'replay-typo' into 'master'
Spell it "forward"

See merge request KartKrew/Kart-Public!147
2019-06-23 12:34:07 -04:00
James R
76c5e3d6fe Spell it "forward" 2019-06-22 21:40:20 -07:00
Sryder
1e000d27ed Merge branch 'fileneededconfig-fix' into 'master'
Fix fileneeded overflow

See merge request KartKrew/Kart-Public!146
2019-06-21 13:13:14 -04:00