Commit graph

5530 commits

Author SHA1 Message Date
Sal
f08c8d018e Merge branch 'water-update' into 'next'
Water update

See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
Sally Cochenour
9c14a2c58f Merge branch 'next' into color-fixes 2019-02-27 00:09:39 -05:00
Sal
a47470e1b1 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
44462d0dd7 10 new colors
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
Sally Cochenour
84251d003d Merge branch 'next' into compiler-garbage 2019-02-26 18:09:26 -05:00
Sal
592ae58c79 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
ea0a87d49c 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
22434949e5 Extend pingtable by 1 for the servermaxping entry 2019-02-26 17:44:35 -05:00
Sally Cochenour
1d3adb0491 Remove mixed declaration that triggers ERRORMODE on my setup 2019-02-26 17:33:10 -05:00
Sally Cochenour
7de2cf8d39 Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
Sally Cochenour
a993cffb69 Modify a few colors
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
fickleheart
1499a47541 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart
9d30a0f2bc Adjust FOV change for 2p 2019-02-24 11:59:21 -06:00
fickleheart
4143c31176 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart
d6b9a75230 Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
Sally Cochenour
c543c35b91 Revert this minor change 2019-02-22 22:50:13 -05:00
Sally Cochenour
f91eb68b70 Update item table
Not looking forward to testing...
2019-02-22 22:49:27 -05:00
Alam Arias
d5a4759121 signed and unsigned compare 2019-02-22 21:13:00 -05:00
Alam Arias
cec79dee87 if you going to use abs(), you need to work in signed types 2019-02-22 21:04:53 -05:00
Sally Cochenour
014466cc67 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -05:00
Sal
5e9a11d467 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
d9759df874 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
b2d4ec501c Add parentheses 2: Move parentheses 2019-02-22 19:11:50 -05:00
Sally Cochenour
df503c7f19 Add parentheses 2019-02-22 19:07:54 -05:00
Sal
6152657885 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
0eb30bceb7 Rename splitscreen member to something more meaningful 2019-02-22 15:57:44 -08:00
Sal
2389bfd4cc 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
0320b17f80 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
447100a9ab 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
6b6fba841c Banana snipe sfx 2019-02-22 18:43:10 -05:00
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
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
James
09c3fd4329 Hyu b gone 2019-02-19 23:15:31 -05: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
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
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