mazmazz
a5887d06e1
Fix mainwads check in d_main
2018-12-23 00:29:59 -05:00
mazmazz
a51130a8b9
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
mazmazz
e88db2e2b1
Use labs for long value
2018-12-16 19:47:02 -05:00
mazmazz
8bd3f38dd2
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
mazmazz
492d1ba749
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
mazmazz
9e466c4e77
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
mazmazz
a0f2e8eb94
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
mazmazz
77456cd593
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
mazmazz
2237aa1d07
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
mazmazz
6bdff246a8
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
mazmazz
b6d1cca4da
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
mazmazz
a283d229b4
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
Monster Iestyn
dcf65e0f72
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
2ca1cd415e
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
Digiku
db7d712ebe
Merge branch 'awayviewmobj-sanity-checks' into 'next'
...
Awayviewmobj sanity checks
See merge request STJr/SRB2!377
2018-12-13 16:11:27 -05:00
Digiku
dbaa3aaf3b
Merge branch 'savegamename-fix' into 'master'
...
Fix savegamename being improperly built
See merge request STJr/SRB2!378
2018-12-13 16:11:13 -05:00
mazmazz
a396ad5240
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
17766f3130
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
mazmazz
2406de3167
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
56e54a38cc
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
847350d664
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
Monster Iestyn
ee474bab23
Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens
2018-12-11 18:39:58 +00:00
Digiku
09c57a719b
Merge branch 'no-more-installer' into 'master'
...
Remove windows installer
See merge request STJr/SRB2!372
2018-12-07 16:58:37 -05:00
mazmazz
4a712f936d
Remove windows installer
2018-12-07 16:56:48 -05:00
Digiku
3880da272b
Merge branch '21-version' into 'next'
...
Update code versions to 2.1.21
See merge request STJr/SRB2!338
2018-12-06 17:20:45 -05:00
mazmazz
72e55b4623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
dac15d2283
Adjust version strings
2018-12-06 15:39:19 -05:00
Digiku
31b88c5195
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
439fff4402
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
49d899ffea
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
86b3221986
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
fd6f5a9fbd
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
Digiku
d0011199a9
Merge branch 'fire-trigger' into '21-version'
...
Controller defaults: Set Ring Toss to right trigger instead of left trigger
See merge request STJr/SRB2!370
2018-12-06 08:15:38 -05:00
mazmazz
5e6e0d539b
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
e8584f2535
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
mazmazz
d488dd0763
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
Digiku
4b16dec91e
Merge branch '21-tweaks' into '21-version'
...
Change 2p controller defaults
See merge request STJr/SRB2!369
2018-12-06 05:48:06 -05:00
mazmazz
0e0ccf2ae6
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
Digiku
ba0088ef92
Merge branch 'versionflags' into '21-version'
...
Add OS and 32/64-bitness to VERSION console command
See merge request STJr/SRB2!368
2018-12-05 13:15:21 -05:00
mazmazz
41ca8bb24a
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
e30832216f
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
a0938bdd24
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
d576ed31e0
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
91504ed81d
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
Monster Iestyn
f5e6db5f56
Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server
...
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
2018-12-05 17:39:02 +00:00
mazmazz
b03da28390
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
c642015b81
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
Monster Iestyn
05a8bbe056
Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart
2018-12-04 18:54:36 +00:00
Monster Iestyn
b32f5830ed
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00