Alam Arias
4eb655569e
Merge remote-tracking branch 'origin/master' into upstream-merge
2019-03-02 13:27:10 -05:00
Alam Arias
c82fd8acd7
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
Alam Arias
47c32fa785
fixed compiling without blua support
2019-03-01 17:46:19 -05:00
Alam Arias
340d769386
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 17:33:32 -05:00
Alam Ed Arias
86264a545e
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
2eb26bc68e
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
e4062e1dc0
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
8d124101f4
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Alam Arias
65cf8c5da2
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
Monster Iestyn
659e8e8162
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
Sal
7503567d29
Merge branch 'higher-maxnetnodes' into 'next'
...
Upped MAXNETNODES
See merge request KartKrew/Kart-Public!94
2019-03-01 06:29:52 -05:00
wolfy852
0df85f62ad
Merge branch 'master' into next
2019-03-01 00:13:47 -06:00
wolfy852
cc7112eaf5
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfy852
088bfd30d0
Stop Linux servers from hanging every 34 hours
...
This drastically increases the amount of time Linux servers can stay up for before hanging.
2019-02-28 18:51:57 -06:00
Alam Ed Arias
3cbb1204ad
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
8a6f4b6405
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Sal
506f98f5e2
Merge branch 'color-fixes' into 'next'
...
Color fixes
See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
Steel Titanium
c748882d04
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
f26c1d3168
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
Steel Titanium
7fc180604b
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Steel Titanium
3085847630
Add some parentheses
2019-02-27 15:55:39 -05:00
Steel Titanium
ad6be71d1e
Upped MAXNETNODES
2019-02-27 15:43:29 -05:00
Monster Iestyn
538605117e
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn
ea0c251a92
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Sally Cochenour
ac61451556
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:32:52 -05:00
Sal
d59ea8972d
Merge branch 'hyuu-fix' into 'next'
...
Fix Hyudoro being tangible to Jawz and Orbinauts
See merge request KartKrew/Kart-Public!79
2019-02-27 01:31:52 -05:00
Sally Cochenour
75125b726e
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
Sally Cochenour
53998821a2
Merge branch 'master' into next
2019-02-27 01:22:18 -05:00
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
Sally Cochenour
e37417213e
Merge branch 'next' into color-fixes
2019-02-27 00:09:39 -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
