Alam Arias
3fe3d1121a
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:53:57 -05:00
Monster Iestyn
67e721e983
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
3d8e25e440
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
Monster Iestyn
27adf300b2
Merge branch 'apng-backport' into 'master'
...
aPNG backport from Kart
See merge request STJr/SRB2!464
2019-03-01 11:04:08 -05:00
Sal
9210ab8497
Merge branch 'higher-maxnetnodes' into 'next'
...
Upped MAXNETNODES
See merge request KartKrew/Kart-Public!94
2019-03-01 06:29:52 -05:00
wolfy852
8e51cb18ba
Merge branch 'master' into next
2019-03-01 00:13:47 -06:00
wolfs
d3e2e37c66
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request KartKrew/Kart-Public!95
2019-03-01 01:12:32 -05:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfy852
cbb3145236
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
7cd60a544a
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
5620d0188e
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
c41bc51e83
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
5975d3fb30
Add some parentheses
2019-02-27 15:55:39 -05:00
Steel Titanium
3b9c4fff52
Upped MAXNETNODES
2019-02-27 15:43:29 -05:00
Alam Arias
d865b5660a
CircleCI: test build SRB2 without network support
2019-02-27 14:37:31 -05:00
Monster Iestyn
e86d0836a3
Merge branch 'updatelibgme' into 'master'
...
Update game-emu-music lib to 0.6.2
See merge request STJr/SRB2!444
2019-02-27 13:49:44 -05:00
Monster Iestyn
d76e946b3e
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
135190616a
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:32:52 -05:00
Sal
60ae6a6470
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
4f01202bb5
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
Sally Cochenour
c6be0c24d1
Merge branch 'master' into next
2019-02-27 01:22:18 -05:00
Sal
fd7711c35b
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request KartKrew/Kart-Public!88
2019-02-27 01:18:49 -05:00
Sally Cochenour
4ecd71d026
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
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
