fickleheart
|
18dba65f17
|
Don't shoot asterisks off-screen on the join password screen
|
2019-03-06 23:34:30 -06:00 |
|
fickleheart
|
ddf2db8a36
|
Fix freeze when trying to host with a join password already set
|
2019-03-06 23:32:47 -06:00 |
|
fickleheart
|
0ed74b3066
|
Missed an include
|
2019-03-06 22:45:02 -06:00 |
|
fickleheart
|
219b240bcf
|
Recycle oldest challenges first if all are taken
|
2019-03-06 22:36:13 -06:00 |
|
fickleheart
|
bc46c3540f
|
Show message on incorrect password
|
2019-03-06 22:11:35 -06:00 |
|
fickleheart
|
52b743a18f
|
Fix join password not recognizing shifted characters
|
2019-03-06 22:07:28 -06:00 |
|
fickleheart
|
b5c4866706
|
Add -remove option to joinpassword
|
2019-03-06 21:30:39 -06:00 |
|
fickleheart
|
264454ca70
|
hblurgle spburgle this code sucks
|
2019-03-05 22:27:25 -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
|
3fa1751706
|
CircleCi: we need SSH for buildbot
|
2019-03-04 16:51:39 -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 |
|
Sal
|
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 |
|
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 |
|
Sal
|
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 |
|
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 |
|
Alam Arias
|
94bd0e39d5
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2019-03-01 13:11:16 -05:00 |
|
Monster Iestyn
|
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 |
|
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 |
|
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
|
fd7711c35b
|
Merge branch 'software-fov' into 'master'
Software FOV
See merge request KartKrew/Kart-Public!88
|
2019-02-27 01:18:49 -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 |
|