52b743a18f
Fix join password not recognizing shifted characters
2019-03-06 22:07:28 -06:00
b5c4866706
Add -remove option to joinpassword
2019-03-06 21:30:39 -06:00
264454ca70
hblurgle spburgle this code sucks
2019-03-05 22:27:25 -06:00
515fb9adad
Merge branch 'master' into next
2019-03-04 17:17:13 -05:00
5537c62271
Merge remote-tracking branch 'upstream/master'
2019-03-04 17:16:37 -05:00
3fa1751706
CircleCi: we need SSH for buildbot
2019-03-04 16:51:39 -05:00
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
56e8f09ae8
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
233033f213
Merge branch 'master' into next
2019-03-02 18:41:58 -05:00
0d584a3145
Do not error about array bounds, some GCC versions's reporting is broken
2019-03-02 18:39:53 -05:00
b9eb5c399b
Just do not warn about unsuffixed float constants
2019-03-02 18:39:10 -05:00
2a672dbd70
Merge branch 'upstream-merge' into 'master'
...
Upstream merge of master
See merge request KartKrew/Kart-Public!96
2019-03-02 17:32:16 -05:00
d4f05e5be9
fixup merged mess for NO-LUA mess
2019-03-02 13:32:47 -05:00
c56cae4d28
Merge remote-tracking branch 'origin/master' into upstream-merge
2019-03-02 13:27:10 -05:00
24ae6107cf
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
7799732988
Merge branch 'no_lua' into 'master'
...
be able to compile without blua support
See merge request KartKrew/Kart-Public!97
2019-03-02 10:08:20 -05:00
2657eb998e
fixed compiling without blua support
2019-03-01 17:46:19 -05:00
ae368a3e0f
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 17:33:32 -05:00
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
94bd0e39d5
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 13:11:16 -05:00
0051eb7039
Merge branch 'circleci' into 'master'
...
CircleCI: test build SRB2 without network support
See merge request STJr/SRB2!462
2019-03-01 12:56:52 -05:00
3fe3d1121a
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:53:57 -05:00
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
3d8e25e440
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
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
9210ab8497
Merge branch 'higher-maxnetnodes' into 'next'
...
Upped MAXNETNODES
See merge request KartKrew/Kart-Public!94
2019-03-01 06:29:52 -05:00
8e51cb18ba
Merge branch 'master' into next
2019-03-01 00:13:47 -06:00
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
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
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
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
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
c41bc51e83
Merge branch 'color-fixes' into 'next'
...
Color fixes
See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
5975d3fb30
Add some parentheses
2019-02-27 15:55:39 -05:00
3b9c4fff52
Upped MAXNETNODES
2019-02-27 15:43:29 -05:00
d865b5660a
CircleCI: test build SRB2 without network support
2019-02-27 14:37:31 -05:00
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
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
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
c6be0c24d1
Merge branch 'master' into next
2019-02-27 01:22:18 -05:00
fd7711c35b
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request KartKrew/Kart-Public!88
2019-02-27 01:18:49 -05:00
f08c8d018e
Merge branch 'water-update' into 'next'
...
Water update
See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
9c14a2c58f
Merge branch 'next' into color-fixes
2019-02-27 00:09:39 -05:00
a47470e1b1
Merge branch 'compiler-garbage' into 'next'
...
Compiler garbage
See merge request KartKrew/Kart-Public!91
2019-02-27 00:08:36 -05:00
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
84251d003d
Merge branch 'next' into compiler-garbage
2019-02-26 18:09:26 -05:00
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
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
22434949e5
Extend pingtable by 1 for the servermaxping entry
2019-02-26 17:44:35 -05:00
fickleheart