Commit graph

6273 commits

Author SHA1 Message Date
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
Sally Cochenour
e37417213e Merge branch 'next' into color-fixes 2019-02-27 00:09:39 -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
008d9c9dc0 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
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
Monster Iestyn
e7952e4de7 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Sally Cochenour
d88d8adf4c Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
Sally Cochenour
e81df9474f 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
James R
64508edabc d'oh 2019-02-24 17:59:13 -08:00
James R
bfcb6cc67e Try to fix compiler errors 2019-02-24 17:47:33 -08:00
fickleheart
0d32f71d05 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart
f2d7021199 Adjust FOV change for 2p 2019-02-24 11:59:21 -06:00
fickleheart
39603af6a1 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart
b085355bdd Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06: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
James R
1124c06220 I am pretty dumb 2019-02-21 22:54:09 -08:00
Alam Ed Arias
482bfd0804 Merge branch 'hide-error-devmode' into 'next'
Show line number on error, also hide under devmode

See merge request STJr/SRB2!458
2019-02-21 23:05:09 -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
887a26f971 Merge branch 'master' into next 2019-02-21 22:42:26 -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
a2820e0f51 Some small changes. 2019-02-21 19:48:49 -05:00
Steel Titanium
512b001aa0 Save when quitting the game.
Also use default reason if not custom reason is given.
2019-02-21 19:48:15 -05:00
Steel Titanium
deb58b0e68 Save ban list right after banning. 2019-02-21 19:47:00 -05:00
Steel Titanium
4f5d698d80 Add command to ban an IP address. 2019-02-21 19:44:18 -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
James R
e984c3d868 Document the playdemo command 2019-02-20 19:25:56 -08:00
james
5c041126d6 Add race placement criteria to view command 2019-02-20 19:13:32 -08:00
james
a3c2c97a75 Add setviews command 2019-02-20 19:05:40 -08:00
James R
a991af5c6a Remove jitters in view command 2019-02-20 18:58:17 -08:00
wolfy852
77fca822c4 Handle things in a more sensible way 2019-02-20 19:04:18 -06:00