Commit graph

5469 commits

Author SHA1 Message Date
Sally Cochenour
22cfbd8fd1 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -05:00
Sal
5f6c63f3b0 Merge branch 'water-update' into 'next'
Water update

See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
Sal
f4f6c90522 Merge branch 'compiler-garbage' into 'next'
Compiler garbage

See merge request KartKrew/Kart-Public!91
2019-02-27 00:08:36 -05:00
Sally Cochenour
10db147a0c Merge branch 'next' into compiler-garbage 2019-02-26 18:09:26 -05:00
Sal
dedf6b5bd1 Merge branch 'wipeout-particle-tweak' into 'next'
Wipeout particle tweak

See merge request KartKrew/Kart-Public!84
2019-02-26 17:50:13 -05:00
Sal
d115611fce Merge branch 'clang-fix' into 'next'
use fixed_t so abs() would work

See merge request KartKrew/Kart-Public!86
2019-02-26 17:49:28 -05:00
Sally Cochenour
5d20a15b6b Extend pingtable by 1 for the servermaxping entry 2019-02-26 17:44:35 -05:00
Sally Cochenour
69a9efeb6f Remove mixed declaration that triggers ERRORMODE on my setup 2019-02-26 17:33:10 -05:00
Sally Cochenour
de4eddb98e Revert this minor change 2019-02-22 22:50:13 -05:00
Sally Cochenour
a3c48d7c40 Update item table
Not looking forward to testing...
2019-02-22 22:49:27 -05:00
Alam Arias
c170be0051 signed and unsigned compare 2019-02-22 21:13:00 -05:00
Alam Arias
e741c3a0d6 if you going to use abs(), you need to work in signed types 2019-02-22 21:04:53 -05:00
Sally Cochenour
12dd8e49c0 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -05:00
Sal
ea0da92c22 Merge branch 'ping-stuff-take2' into 'next'
Ping improvements

See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
wolfy852
277216af2b I don't think these old interfaces even compile but let's not kill them off 2019-02-22 18:13:22 -06:00
Sally Cochenour
c257c83ff1 Add parentheses 2: Move parentheses 2019-02-22 19:11:50 -05:00
Sally Cochenour
a13d177a44 Add parentheses 2019-02-22 19:07:54 -05:00
Sal
5f4e52b4d8 Merge branch 'expose-splitscreen' into 'next'
Expose splitscreenplayer in player_t

See merge request KartKrew/Kart-Public!74
2019-02-22 19:04:48 -05:00
James R
f8928300ec Rename splitscreen member to something more meaningful 2019-02-22 15:57:44 -08:00
Sal
e07d3b2b74 Merge branch 'item-odds-fixup' into 'next'
Simulate fractional precision on item odds

See merge request KartKrew/Kart-Public!70
2019-02-22 18:53:28 -05:00
Sal
36852fbaa8 Merge branch 'banip-command' into 'next'
Ban IP command

See merge request KartKrew/Kart-Public!73
2019-02-22 18:49:41 -05:00
Sal
3980968707 Merge branch 'cherrypicks-from-netreplays' into 'next'
Misc fixes

See merge request KartKrew/Kart-Public!76
2019-02-22 18:45:44 -05:00
Sally Cochenour
02862f8010 Banana snipe sfx 2019-02-22 18:43:10 -05:00
Alam Arias
7dd88a8086 Merge branch 'master' into next 2019-02-21 22:54:29 -05:00
Alam Arias
82f2ee4384 Merge remote-tracking branch 'upstream/master' 2019-02-21 22:50:58 -05:00
Alam Ed Arias
7a09161e69 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
45e9e3f7f9 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Sally Cochenour
de6c99c9fb Grow cancel
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00
Steel Titanium
039099ed8b Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into banip-command 2019-02-20 17:59:12 -05:00
James
bc1990f7d4 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
fickleheart
e23f1e66b4 Hold on, this works. 2019-02-19 22:21:07 -06:00
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
James
e1d2ddf3ce Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
James
aebc8179cc Water skipping speed requirements are stricter 2019-02-19 21:57:56 -05:00
Steel Titanium
8a3fa4ebed Some small changes. 2019-02-19 21:22:35 -05:00
James
5ce17bc17b Missed a line 2019-02-19 20:29:53 -05:00
fickleheart
69faafc375 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:27:08 -06:00
James
4397db9b65 Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
wolfy852
8f276f7791 ...remove this forgotten comment too while I'm at it. 2019-02-19 18:54:24 -06:00
wolfy852
733c472e1f Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
James
a31b204cf2 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
Sal
4096212282 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
4619e8ad82 Add check to all of the friction stuff 2019-02-19 17:05:04 -06:00
fickleheart
0183368a6c Only apply friction changes on the ground 2019-02-19 16:46:48 -06:00
Alam Arias
54983371fe Merge branch 'master' into next 2019-02-19 17:21:13 -05:00
Sal
73fa403976 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
b2f93d8357 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
ece44fbfb1 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
5e8236c74f Add null check too 2019-02-19 16:04:23 -06:00
James
3a4e0d71c7 Merge branch 'master' into minor-item-tweaks 2019-02-19 16:20:32 -05:00