Commit graph

7613 commits

Author SHA1 Message Date
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
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
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
Snu
9dda3a2edf Use P_SetTarget instead of fast->target 2020-05-14 04:17:24 +01:00
Snu
d40b5dd73e god damnit 2020-05-14 03:23:28 +01:00
Snu
e502397a98 add targets to MT_FASTLINEs spawned to tell what they're spawned from 2020-05-14 03:13:00 +01:00
James R
6e3a92ed52 player.ping for the ping in milliseconds of the player 2020-05-13 16:17:40 -07:00
Monster Iestyn
49ff331ac0 Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)

(cherry picked from commit e501d9c6af)
2020-05-13 16:03:26 -07:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
0038241325 Merge branch 'master' into new-cars-movie 2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sal
40333bf158 Merge branch 'merge-12' into 'master'
Merge v1.2

See merge request KartKrew/Kart!262
2020-05-12 22:34:31 -04:00
Sally Coolatta
95a077b4dd C'mon git merge everything, not just most of it |:V 2020-05-12 03:16:35 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
f903ca960d Not in modeattacking 2020-05-12 01:41:00 -04:00
Sally Coolatta
ccfc326885 Add to CMakeLists 2020-05-12 00:20:59 -04:00
Sally Coolatta
45e2f03846 New colors
- Removed Salmon, Robo-Hood, Caribbean, and Azure.
- Added Skunk, Robin, Blueberry, and Blossom.
- Updated Lime, Algae, Violet and Magenta.
- Renamed old Blueberry to Midnight.
2020-05-11 23:46:37 -04:00
Wolfy
a8529f0855 Update patch.kart hash 2020-05-11 22:31:38 -05:00
wolfs
4bfea852f8 Merge branch 'appveyor-shit' into 'next'
Fuck you Appveyor / Thank you Appveyor

See merge request KartKrew/Kart-Public!165
2020-05-11 22:43:44 -04:00
James R
2e42865655 Fucking shadowed declarations in hw_md2.c 2020-05-11 18:57:38 -07:00
James R
bd52a32eb6 Disable 64-bit Appveyor builds 2020-05-11 18:55:20 -07:00
James R
3e2c7f42a1 Name the archive like the EXE
(cherry picked from commit 4304fe91e65845e3887935de046876b6313af9c9)
2020-05-11 18:45:46 -07:00
James R
72c4eedd4f Windows is dumb so no colon
srb2win-jameds-appveyor-exename-b1d931d47.exe

(cherry picked from commit 70cf119a8402607116b2f8fbb79028a2de0e8d96)
2020-05-11 18:45:46 -07:00
James R
ae7eb4bd57 Check if this actually is a PR before using those variables
(cherry picked from commit e082553f6d3a90baf97e056ab6790ce136f502d0)
2020-05-11 18:45:45 -07:00
James R
9b6410e86f I promise I know what I'm doing
(cherry picked from commit 6337932190d68d6f825f4f5dd47a6f3655c88f16)
2020-05-11 18:45:45 -07:00
James R
6265bd53fb Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-b1d931d47.exe
(cherry picked from commit ef2febe1e01bc7c93f30d2063bfd754b1a79dd3a)
2020-05-11 18:45:45 -07:00
James R
959674c533 Well I'm an idiot
(cherry picked from commit b1d931d471bcf2ec9a40f6e7e52518807c5fd14b)
2020-05-11 18:45:45 -07:00
James R
98d6708b29 Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-a6d49eaaa.exe

(cherry picked from commit d3315ae03c57296bfb5a7f9f5959492bdb7de24c)
2020-05-11 18:45:44 -07:00
James R
15193cb2b3 Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe

(cherry picked from commit c3f42859882e6a1a789668d9b78d1310dd5e7312)
2020-05-11 18:45:44 -07:00
James R
069e3589c2 Use GCC 8.1 for x86_64
(cherry picked from commit 658b8dcfa95935bbaef92c15476ad57ecc96950f)
2020-05-11 18:45:43 -07:00
James R
32ef2ec1b6 Remove Direct Draw from AppVeyor config
(cherry picked from commit 945f50c2736ee64734dcc94f36ff7dff4085c8e2)
2020-05-11 18:45:42 -07:00
Alam Ed Arias
06448c15cf Appveyor: other way around, the Mingw32 is at 9.1
(cherry picked from commit 0c2b3002944b28cd823326fb5febc71fad120ca0)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
85ae5251fc Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
(cherry picked from commit 33c0b825a7cdfd6538f388748dba334191fbb9ee)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
ca22d7524e Makefile: GCC80 does not exist
(cherry picked from commit eacf89e309d555bda78ed69945a7d995e56a3292)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
2a116ac847 Tested to be compile with Mingw64 9.1.0
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07:00
Alam Ed Arias
a3287a8913 Makefile: support GCC 9.1
(cherry picked from commit d5cc3ce48daf594fc64ecdbaeceb5c537cf5bf72)
2020-05-11 18:43:01 -07:00
Alam Ed Arias
c12fac04c1 Makefile: stop building with DWARF v2 debugging info
(cherry picked from commit 07f89fd6b5130b886ba20cf4e8a2f1022853fb14)
2020-05-11 18:43:01 -07:00