stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-16 07:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity
7226 commits 175 branches 41 tags 264 MiB
Commit graph

7226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Digiku
feb7b05e6e 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
6b5fc921f2 Remove windows installer 2018-12-07 16:56:48 -05:00
Digiku
1029463741 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
df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
mazmazz
60afce5771 Disable XINPUT before initing the joy subsystem 2018-12-06 14:03:46 -05:00
Digiku
17e9188c89 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
3ceeb6a205 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz
0be61e8830 a stray if block 2018-12-06 12:03:53 -05:00
mazmazz
a5eb62b73e alwaysfreelook -> alwaysmlook string 2018-12-06 12:02:45 -05:00
mazmazz
70aa4ce18e 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
mazmazz
6694b7d679 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) 
(with log messages)
 2018-12-06 10:54:58 -05:00
Digiku
88b2e5ce84 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
f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz
5b3a1e0c55 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz
a802069313 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
Digiku
7852e418d5 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
aaf5d2e1dc Change 2p controller defaults 2018-12-06 05:26:28 -05:00
Digiku
68ed55fa71 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
9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4 More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1 _WINDOWS instead of _WIN32 for DD 2018-12-05 12:55:05 -05:00
mazmazz
6d9fb0d3fd Merge remote-tracking branch 'public-gitlab/21-version' into versionflags 2018-12-05 12:49:21 -05:00
Monster Iestyn
aee8dcdff8 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
a6dcd5555e Add various flags to version string 2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85 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
b4b82e681c 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
e353e2ef70 Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
e6e5856fd8 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
631f6ed406 Merge branch 'joystick-juggling' into 'master' 
Joystick juggling

See merge request STJr/SRB2!355
 2018-12-04 11:51:55 -05:00
Digiku
0d86292d10 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
e224bfd0e6 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
decb22dabd Make uninstaller a self-extractable 2018-12-04 11:17:08 -05:00
Monster Iestyn
d1a8e3acdb 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
20386d26ee 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
7b1423a236 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
2b336b9f2f 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
5ae8669eea Add DLL documentation for install bundling 2018-12-04 00:51:45 -05:00
mazmazz
43e9524c24 Move unneeded binaries to an Old subfolder 2018-12-04 00:51:29 -05:00
mazmazz
4ec3eb9375 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
c799584f3d 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
d071c615e3 Merge branch 'mac-icon-update' into 'master' 
Update OSX icon

See merge request STJr/SRB2!363
 2018-12-03 23:10:28 -05:00
mazmazz
60feae1014 Update OSX icon 2018-12-03 23:09:54 -05:00
Digiku
ba81e26f71 Merge branch 'controller-menu-touchup' into 'master' 
Controller select menu improvements.

See merge request STJr/SRB2!354
 2018-12-03 23:00:36 -05:00
Digiku
42cb597731 Merge branch 'joystick-juggling-two' into 'next' 
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
 2018-12-03 22:59:19 -05:00
Digiku
8471c416d7 Merge branch 'gc-menus' into 'next' 
Make mappable buttons for System Menu, Screenshot, Movie, and Viewpoint

See merge request STJr/SRB2!358
 2018-12-03 22:58:43 -05:00
Digiku
d507aa231e Merge branch 'cmake-strings' into 'master' 
CMake:Use commit hash and branch name.

Closes #37

See merge request STJr/SRB2!360
 2018-12-03 22:58:23 -05:00
Digiku
ccf5c9d040 Merge branch 'installer-followup' into 'master' 
Forgot a gitignore

See merge request STJr/SRB2!362
 2018-12-03 22:17:06 -05:00