fickleheart
|
055d73c1e7
|
Move HandleConnect to the same place as other packets
|
2019-03-09 12:01:47 -06:00 |
|
fickleheart
|
96b47d3065
|
Don't shoot asterisks off-screen on the join password screen
|
2019-03-06 23:34:30 -06:00 |
|
fickleheart
|
8a022670bd
|
Fix freeze when trying to host with a join password already set
|
2019-03-06 23:32:47 -06:00 |
|
fickleheart
|
d013c9117c
|
Missed an include
|
2019-03-06 22:45:02 -06:00 |
|
fickleheart
|
b696e68def
|
Recycle oldest challenges first if all are taken
|
2019-03-06 22:36:13 -06:00 |
|
fickleheart
|
9e9dcf759a
|
Show message on incorrect password
|
2019-03-06 22:11:35 -06:00 |
|
fickleheart
|
1da3d7cc48
|
Fix join password not recognizing shifted characters
|
2019-03-06 22:07:28 -06:00 |
|
fickleheart
|
a1b2eaa7fc
|
Add -remove option to joinpassword
|
2019-03-06 21:30:39 -06:00 |
|
fickleheart
|
b9543d18b4
|
hblurgle spburgle this code sucks
|
2019-03-05 22:27:25 -06:00 |
|
Alam Arias
|
9a8e13af5c
|
Merge branch 'master' into next
|
2019-03-04 17:17:13 -05:00 |
|
Alam Arias
|
58b4b8b9e7
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-04 17:16:37 -05:00 |
|
Alam Ed Arias
|
ca407e2be7
|
CircleCi: we need SSH for buildbot
|
2019-03-04 16:51:39 -05:00 |
|
Alam Ed Arias
|
9dbdc6a3a5
|
No more errors for VC6 support
|
2019-03-04 16:46:14 -05:00 |
|
Alam Ed Arias
|
4b0e8db4c1
|
no more floating constants warnings, and disable bad array bounds warnings
|
2019-03-04 16:46:14 -05:00 |
|
Alam Arias
|
aaccb4edff
|
fixed compiling for MSVC 2017
|
2019-03-04 16:33:06 -05:00 |
|
Alam Arias
|
635a38091e
|
Merge branch 'master' into next
|
2019-03-02 18:41:58 -05:00 |
|
Alam Arias
|
32d579be4e
|
Do not error about array bounds, some GCC versions's reporting is broken
|
2019-03-02 18:39:53 -05:00 |
|
Alam Arias
|
350664996e
|
Just do not warn about unsuffixed float constants
|
2019-03-02 18:39:10 -05:00 |
|
Sal
|
ae6bfe115d
|
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
|
b9b14fb9a3
|
fixup merged mess for NO-LUA mess
|
2019-03-02 13:32:47 -05:00 |
|
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 |
|
Sal
|
333805ea95
|
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
|
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
|
2eb26bc68e
|
Fix building without BLUA support
|
2019-03-01 17:31:32 -05:00 |
|
Alam Arias
|
112d8edc85
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2019-03-01 13:11:16 -05:00 |
|
Monster Iestyn
|
0bfcbca0a2
|
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
|
054bd221fc
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2019-03-01 11:53:57 -05: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
|
351a5e28be
|
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
|
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 |
|
wolfs
|
e9f802deb3
|
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
|
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
|
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 |
|
Alam Arias
|
0ea2177a4e
|
CircleCI: test build SRB2 without network support
|
2019-02-27 14:37:31 -05:00 |
|
Monster Iestyn
|
4933e1de51
|
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
|
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 |
|
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
|
53998821a2
|
Merge branch 'master' into next
|
2019-02-27 01:22:18 -05:00 |
|
Sal
|
930dd97abf
|
Merge branch 'software-fov' into 'master'
Software FOV
See merge request KartKrew/Kart-Public!88
|
2019-02-27 01:18:49 -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 |
|