fcf072cbeb
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
1975a9b885
Prevent music changes from playing when unfocused
2019-03-11 21:48:29 -05:00
0f9648eac0
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
bb187c1d27
Make "Focus lost" HUD overlay optional
2019-03-11 12:50:01 -07:00
5ca69ce234
Fix compiling with VS
2019-03-11 09:58:37 -04:00
6717e09e57
Merge branch 'file-exploit-fix' into 'master'
...
Fix majormods not getting set for files added via -file
See merge request KartKrew/Kart!126
2019-03-10 22:24:33 -04:00
66c9d9aa83
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
fae8833ff4
Fix the game getting flagged as modified by default
...
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
2019-03-10 19:27:45 -05:00
b955f4f66d
Attempt to fix replaced maps not marking the game as modified
...
What this ACTUALLY does is mark the game as modified by default.
2019-03-10 18:55:55 -05:00
ef0130f951
Merge branch 'dontskipframes' into 'master'
...
Don't skip frames in software mode
See merge request KartKrew/Kart-Public!103
2019-03-10 13:29:10 -04:00
16d00137b8
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:38:36 -05:00
cd39b951bb
partly Revert "TravisCI: remove WFLAGS"
...
This reverts commit 8780800e8e
2019-03-09 20:36:44 -05:00
8780800e8e
TravisCI: remove WFLAGS
2019-03-09 20:17:14 -05:00
6fb950002c
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:13:41 -05:00
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
77649ef6d1
Always return false instead.
2019-03-08 18:51:55 -05:00
0e2cefe251
Properly comment out the function
2019-03-07 18:52:27 -05:00
7731fe8c24
Fix unused function error
2019-03-07 18:20:57 -05:00
3acf674b8a
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into dontskipframes
2019-03-07 18:13:16 -05:00
7dc1d163be
Merge branch 'archiveworld-sigsegv-fix' into 'master'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame
See merge request KartKrew/Kart-Public!99
2019-03-07 01:18:38 -05:00
dc1786203d
Merge branch 'master' into dontskipframes
2019-03-05 22:11:00 -05:00
0f51f3b7e3
Don't skip frames in software mode
2019-03-05 22:07:53 -05:00
f57335deef
Check that lumps are okay
2019-03-04 22:13:22 -08: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
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
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
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
fickleheart