Commit graph

5851 commits

Author SHA1 Message Date
Alam Arias
f454157af9 Merge branch 'master' into next 2019-02-21 22:54:29 -05:00
Alam Arias
8db5bda230 Merge remote-tracking branch 'upstream/master' 2019-02-21 22:50:58 -05:00
Alam Ed Arias
7667122912 Merge branch 'gcc8-statement-warning' into 'master'
GCC8: Disable multi statement macros errors.

See merge request STJr/SRB2!459
2019-02-21 22:32:38 -05:00
Steel Titanium
c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Sally Cochenour
a6dd439e99 Grow cancel
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00
James R
1b2813b9d5 Document the playdemo command 2019-02-20 19:25:56 -08:00
james
c32d7f6745 Add race placement criteria to view command 2019-02-20 19:13:32 -08:00
james
fc8dc63f95 Add setviews command 2019-02-20 19:05:40 -08:00
James R
0e1d7ec6c6 Remove jitters in view command 2019-02-20 18:58:17 -08:00
wolfy852
84755ec171 Handle things in a more sensible way 2019-02-20 19:04:18 -06:00
wolfy852
23f1974117 Bump MAXSKINS to 128
Can't believe people actually need this now.
2019-02-20 18:55:53 -06:00
Steel Titanium
2d34df535d Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into banip-command 2019-02-20 17:59:12 -05:00
James
38ad726e55 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
fickleheart
879d3aa1a8 Hold on, this works. 2019-02-19 22:21:07 -06:00
wolfy852
f34ed24132 Correct an oversight 2019-02-19 22:20:18 -06:00
James
09c3fd4329 Hyu b gone 2019-02-19 23:15:31 -05:00
wolfy852
4970df47e1 Merge branch 'next' into file-exploit-fix 2019-02-19 22:13:03 -06:00
James
68b8ec8162 Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
wolfy852
df1a22d5fd Fix Hyudoro being tangible to Jawz and Orbinauts 2019-02-19 21:27:14 -06:00
James
ca87cfbf01 Water skipping speed requirements are stricter 2019-02-19 21:57:56 -05:00
Steel Titanium
0913a623fb Some small changes. 2019-02-19 21:22:35 -05:00
James
ff57b4bc22 Missed a line 2019-02-19 20:29:53 -05:00
fickleheart
d2c708ba93 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:27:08 -06:00
fickleheart
766ceabf91 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:26:32 -06:00
James
f822eb94cf Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
wolfy852
30d37ce4ca ...remove this forgotten comment too while I'm at it. 2019-02-19 18:54:24 -06:00
wolfy852
1fb65c72ff Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
James
2f4d3eb087 Mines can be punted
Setting behind leaves a longer startup animation window so that it can be punted more easily
2019-02-19 18:38:54 -05:00
fickleheart
7a80195ed7 Fix count limiter not always working right for titledemo netreplays 2019-02-19 17:33:02 -06:00
Sal
66c4354115 Merge branch 'make-bumpcode-perfecter' into 'next'
Make bumpcode perfecter

See merge request KartKrew/Kart-Public!77
2019-02-19 18:09:30 -05:00
fickleheart
a59a1c53b0 Add check to all of the friction stuff 2019-02-19 17:05:04 -06:00
fickleheart
8988927d16 Only apply friction changes on the ground 2019-02-19 16:46:48 -06:00
Alam Arias
ed3f9e2464 Merge branch 'master' into next 2019-02-19 17:21:13 -05:00
Sal
ee57ab9afe Merge branch 'shrink-removed-checks' into 'next'
Add some P_MobjWasRemoved checks around code that shrink touches

See merge request KartKrew/Kart-Public!72
2019-02-19 17:14:08 -05:00
Sal
eabe8fbadd Merge branch 'lua-archive' into 'next'
Fix dedicated server extra lua variables not being synched for joiners

See merge request KartKrew/Kart-Public!75
2019-02-19 17:10:52 -05:00
Sal
d85dcd073a Merge branch 'latency-tweaks' into 'next'
Fix cmd latency occasionally jumping to max

See merge request KartKrew/Kart-Public!78
2019-02-19 17:05:45 -05:00
fickleheart
580e12a32a Add null check too 2019-02-19 16:04:23 -06:00
James
4480a1c55a Merge branch 'master' into minor-item-tweaks 2019-02-19 16:20:32 -05:00
Alam Ed Arias
a6315f895d Merge branch 'apng-oh-shit-fixes' into 'master'
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
2019-02-19 12:51:52 -05:00
fickleheart
9c5ae02755 Fix cmd latency occasionally jumping to max 2019-02-19 08:05:35 -06:00
fickleheart
838ed005d2 Remove debugging print 2019-02-18 23:39:08 -06:00
fickleheart
caf7888eed Fix players sometimes snapping backwards on landing after spikeball hits 2019-02-18 23:35:24 -06:00
fickleheart
9c1749d269 Make extra sure we launch in the correct direction 2019-02-18 23:35:01 -06:00
fickleheart
a4c8388f3b Fix bumps sometimes shooting off stupidly fast 2019-02-18 22:36:26 -06:00
fickleheart
324108d120 Force intermission to 10 seconds on replays 2019-02-18 21:33:15 -06:00
fickleheart
188552e069 Allow viewing karma bombs during replays 2019-02-18 21:23:05 -06:00
fickleheart
a4ac2b000f Improve replay resyncing code
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-18 21:10:23 -06:00
fickleheart
9eb669a061 Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:09:22 -06:00
fickleheart
9da5b9ae6a Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:08:11 -06:00
fickleheart
96972c9ae9 Remove debug print 2019-02-18 20:54:37 -06:00