Commit Graph

4641 Commits

Author SHA1 Message Date
wolfy852 499dcc6bdb Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
wolfy852 a181cd24cd Fix my fuckups
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
2019-03-06 22:28:06 -06:00
wolfy852 87d60eef86 Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
wolfy852 75661f44d7 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
wolfy852 3873635629 Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06:00
Alam Arias 515fb9adad Merge branch 'master' into next 2019-03-04 17:17:13 -05:00
Alam Arias 5537c62271 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias 67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias 145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Arias 56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Alam Arias 233033f213 Merge branch 'master' into next 2019-03-02 18:41:58 -05:00
Alam Arias 0d584a3145 Do not error about array bounds, some GCC versions's reporting is broken 2019-03-02 18:39:53 -05:00
Alam Arias b9eb5c399b Just do not warn about unsuffixed float constants 2019-03-02 18:39:10 -05:00
Alam Arias d4f05e5be9 fixup merged mess for NO-LUA mess 2019-03-02 13:32:47 -05:00
Alam Arias c56cae4d28 Merge remote-tracking branch 'origin/master' into upstream-merge 2019-03-02 13:27:10 -05:00
Alam Arias 24ae6107cf Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Alam Arias 2657eb998e fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Arias ae368a3e0f Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -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
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
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
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
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 c6be0c24d1 Merge branch 'master' into next 2019-02-27 01:22:18 -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
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