Commit graph

2730 commits

Author SHA1 Message Date
Digiku
3ebb6f91f3 Merge branch '2122-execversion' into '2122-version'
EXECVERSION adjustments (config updater)

See merge request STJr/SRB2!408
2018-12-20 18:01:48 -05:00
mazmazz
4e055bd383 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz
495ea70a74 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz
8e2d8ee797 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
mazmazz
92eb63d8b5 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz
8a6031ba01 Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
mazmazz
436c49e38b Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz
1e731416d0 Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
1d4fd996cf Attempt to fix cv_execversion being accessible by console 2018-12-17 13:39:24 -05:00
mazmazz
80d027ee47 Decouple execversion from MODVERSION; add scheme for MINORMODVERSION 2018-12-17 13:38:23 -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
Monster Iestyn
dfdba01591 Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
6146429696 Merge branch 'auto-joystick' into 'master'
Use Joystick 1 and Joystick 2 by default if plugged in

See merge request STJr/SRB2!364
2018-12-04 11:53:58 -05:00
Digiku
2c557d668a Merge branch 'joystick-juggling' into 'master'
Joystick juggling

See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Digiku
3e867e13ff Merge branch 'exchndl-new' into 'master'
Slightly re-organize DLLs and document the required list for bundling

See merge request STJr/SRB2!365
2018-12-04 11:51:17 -05:00
Digiku
6888db044b Merge branch 'installer-followup' into 'master'
Make uninstaller a self-extractable

See merge request STJr/SRB2!367
2018-12-04 11:18:09 -05:00
mazmazz
5dba5210a6 Make uninstaller a self-extractable 2018-12-04 11:17:08 -05:00
Monster Iestyn
ca01834d2e Merge branch 'tiny-makefile-fix' into 'master'
Tiny Makefile Fix

See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
Digiku
bf35a5a72c Merge branch 'installer-followup' into 'master'
Add old-install-list.txt to explicitly define which old install files need to be moved

See merge request STJr/SRB2!366
2018-12-04 01:12:21 -05:00
mazmazz
c0aed5a7dc Add old-install-list.txt to explicitly define which old install files need to be moved
Replaces MoveOldExeDlls routine in installer staging
2018-12-04 01:11:30 -05:00
mazmazz
92913389b8 Move DLL binaries from bin/Resources to libs/dll-binaries
Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.
2018-12-04 00:57:28 -05:00
mazmazz
7655929516 Add DLL documentation for install bundling 2018-12-04 00:51:45 -05:00
mazmazz
ace2b495c2 Move unneeded binaries to an Old subfolder 2018-12-04 00:51:29 -05:00
mazmazz
4d39a8ddcd Update exchndl.dll to 0.9.0
https://github.com/jrfonseca/drmingw/releases/tag/0.9.0
2018-12-04 00:07:14 -05:00
mazmazz
872227f211 Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart) 2018-12-03 23:36:36 -05:00
Digiku
83ef924996 Merge branch 'mac-icon-update' into 'master'
Update OSX icon

See merge request STJr/SRB2!363
2018-12-03 23:10:28 -05:00