Commit graph

7930 commits

Author SHA1 Message Date
Latapostrophe
8b0aa9e333 Change flash cooldown from 5 to 2 seconds 2020-05-20 14:21:50 +02:00
Sryder
b2674a3cd0 Initialise these to 0 just to stop GCC 4.4 from complaining.
This should be okay since 0 generally means "nothing" for these, and they should always be set before being used later on.
2020-05-20 11:47:22 +01:00
Sryder
8e39dfa5c6 D_ModifierKeyResponder is unused now so remove it. 2020-05-20 11:37:38 +01:00
Sryder
139967b732 Merge branch 'extra-travis-deploy' into 'master'
Fix Travis Deployment

See merge request KartKrew/Kart-Public!174
2020-05-19 20:10:42 -04:00
Sal
d0a7adeb5e Merge branch 'freeplay-be-nice' into 'master'
Also apply HUD translucency to FREE PLAY

See merge request KartKrew/Kart-Public!161
2020-05-19 17:29:05 -04:00
Sal
cbd7578490 Merge branch 'mr-ogl-boostpad-fix' into 'master'
Fix wrong orientation in some boost pads in ogl

See merge request KartKrew/Kart-Public!173
2020-05-19 17:27:24 -04:00
Sryder
ba706e8409 Use xenial to build all the versions newer than trusty
I'm not 100% sure why we can't use newer series to build the newer installers. But this seems to be what vanilla does
2020-05-19 20:45:49 +01:00
Sally Coolatta
1ec651ff00 Combine K_FindRandomItems & K_FindEggboxes 2020-05-18 15:30:55 -04:00
Sally Coolatta
c3a5193150 Remove this code, it's in grand-pricks & functional now 2020-05-18 15:19:48 -04:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Sally Coolatta
6aa6521fb4 Allow spectators through Block Players lines 2020-05-18 14:52:26 -04:00
Sal
843721cc8f Merge branch 'sprite-offsets' into 'master'
Sprite offsets for horizontal springs

See merge request KartKrew/Kart!265
2020-05-18 14:39:09 -04:00
Sal
ac8513c9ce Merge branch 'colorize-tweak' into 'master'
Skincolor code cleanup + some new colors

See merge request KartKrew/Kart!260
2020-05-18 14:37:15 -04:00
Sally Coolatta
846ff298eb Fix k_color.c brief 2020-05-18 10:35:12 -04:00
Sally Coolatta
e425eabf04 Merge branch 'master' into grand-pricks 2020-05-17 11:39:39 -04:00
Latapostrophe
b7fb40b51a Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-05-17 11:06:43 +02:00
Sal
a2581c8e4e Merge branch 'use-extern-you-idiot' into 'master'
Fix GCC 10 linking errors

See merge request KartKrew/Kart-Public!170
2020-05-16 09:01:46 -04:00
Hannu Hanhi
5f6e3b0e0f Fix wrong orientation some boost pads in ogl 2020-05-16 13:47:21 +03:00
Sally Coolatta
99d51b80fd Merge branch 'master' into colorize-tweak 2020-05-16 02:10:40 -04:00
Sally Coolatta
6356984eba Merge branch 'master' into sprite-offsets 2020-05-16 00:10:06 -04:00
Sally Coolatta
8be2d12b99 Merge remote-tracking branch 'public/master' 2020-05-16 00:08:53 -04:00
Sally Coolatta
bdb871325f Merge remote-tracking branch 'public/next' 2020-05-16 00:05:55 -04:00
Sally Coolatta
6839a8cb69 OGL model support for runtime sprite offsets 2020-05-15 23:58:22 -04:00
Sally Coolatta
ff756ae35c OGL sprite support 2020-05-15 23:49:17 -04:00
Sally Coolatta
719d4702c1 Merge branch 'master' into sprite-offsets 2020-05-15 23:00:30 -04:00
Sally Coolatta
0706ec3b16 Merge branch 'master' into colorize-tweak 2020-05-15 22:57:06 -04:00
filpAM
ac314d5f34 Fix visplane getting allocated twice 2020-05-16 00:20:52 +00:00
Sal
c3f2c7618f Merge branch 'clearbans-please' into 'master'
Write empty file on clearbans

See merge request KartKrew/Kart-Public!156
2020-05-15 19:29:11 -04:00
Sal
9e6933ff48 Merge branch 'nomixer-fix' into 'master'
Fix "NOMIXER" flag compiling

See merge request KartKrew/Kart-Public!159
2020-05-15 19:28:54 -04:00
Sal
a20a89f5c7 Merge branch 'now-we-spin-in-spinout-only' into 'master'
No more first person hyper spin

See merge request KartKrew/Kart-Public!160
2020-05-15 19:28:38 -04:00
Sal
280f538335 Merge branch 'ferror-errno-yareyare' into 'master'
Fix false file error reporting

See merge request KartKrew/Kart-Public!162
2020-05-15 19:27:08 -04:00
Sal
135c9598a8 Merge branch 'hud-is-fucked' into 'next'
HUD inconsistency in Record Attack

See merge request KartKrew/Kart-Public!164
2020-05-15 19:26:26 -04:00
Sal
35fb7154a1 Merge branch 'fastline-identification' into 'next'
Add targets to MT_FASTLINEs that are spawned

See merge request KartKrew/Kart-Public!169
2020-05-15 19:24:35 -04:00
Sal
112c7af0bf Merge branch 'player-dot-ping' into 'next'
player.ping for the ping in milliseconds of the player

See merge request KartKrew/Kart-Public!167
2020-05-15 19:24:21 -04:00
Sal
dae724b761 Merge branch 'alias-recursion-fix' into 'master'
Fix alias recursion never counting down

See merge request KartKrew/Kart-Public!166
2020-05-15 19:24:02 -04:00
Sryder
4eb7540cb3 Use bionic to build focal version because it has GCC 4.8? 2020-05-16 00:02:33 +01:00
James R
d166dffe82 Let first person camera work in demos
(cherry picked from commit 7a70f882b1)
2020-05-15 10:40:55 -07:00
James R
41f0f34d35 Add missing extern to colortranslations 2020-05-15 10:00:05 -07:00
Monster Iestyn
f0fa25a243 added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
(cherry picked from commit 064f4bcf349e9600552a0b99bd0fbfb3cbcf0958)
2020-05-15 09:58:49 -07:00
Monster Iestyn
166b06b589 turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
(cherry picked from commit dab212dc56936dd92a935d0c81003ff1d35ee2ee)
2020-05-15 09:58:28 -07:00
Monster Iestyn
389e7d415d make savegamename in doomdef.h an extern, put the actual definition in d_main.c
(cherry picked from commit 89cd756cd83e4a03a34d1f16da18142d8167d889)
2020-05-15 09:52:16 -07:00
Sal
e75b6da6fc Merge branch 'new-cars-movie' into 'master'
Code changes required for new Kart sprites

See merge request KartKrew/Kart!259
2020-05-14 22:54:22 -04:00
Sally Coolatta
4555b20e6c Merge branch 'master' into new-cars-movie 2020-05-14 22:42:29 -04:00
Sally Coolatta
8744df641f Merge branch 'master' into grand-pricks 2020-05-14 18:48:34 -04:00
Sal
9921dfbb05 Merge branch 'water-physics' into 'master'
Altered water physics

See merge request KartKrew/Kart!261
2020-05-14 18:47:08 -04:00
Sally Coolatta
b51f206c1c Support antigrav 2020-05-14 18:45:54 -04:00
Sal
4b8f46490e Merge branch 'waypoint-helpers-tweaks' into 'master'
Fix Waypoint Anchors and split paths; DefaultWaypointRadius for your level headers!

See merge request KartKrew/Kart!254
2020-05-14 18:15:33 -04:00
Latapostrophe
6c68c95654 Make explosions cause earthquakes and initiate flashpals 2020-05-14 17:55:33 +02:00
Latapostrophe
fc789790bb Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code 2020-05-14 17:28:33 +02:00
Latapostrophe
f467791161 Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-05-14 17:01:38 +02:00