Digiku
bea76aa4bf
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
Digiku
4c69fe23f6
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
2018-12-19 13:04:24 -05:00
mazmazz
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
TehRealSalt
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
TehRealSalt
0e34e7f32f
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
Alam Arias
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
Alam Ed Arias
d5c7ca1d23
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
Alam Arias
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
TehRealSalt
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
Monster Iestyn
bd58ff8c49
Merge branch 'frame-backslash-fix' into 'next'
...
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
2018-12-17 17:34:41 -05:00
Jimita
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
Jimita
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
Jimita
f3956ffb4c
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
Jimita
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
Monster Iestyn
e9be5e895e
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
TehRealSalt
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
TehRealSalt
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
TehRealSalt
9e596d15af
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
TehRealSalt
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
TehRealSalt
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
Alam Ed Arias
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
TehRealSalt
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
Monster Iestyn
6b1b11441d
Merge branch 'sdl-sound-fix' into 'master'
...
SDL: Force use DirectSound driver to fix wrong-pitch sound effects
See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
TehRealSalt
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
TehRealSalt
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
Alam Ed Arias
6e79722437
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
Alam Ed Arias
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
Alam Ed Arias
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
Alam Ed Arias
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
Monster Iestyn
f4ce770c1c
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
Monster Iestyn
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
mazmazz
de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
mazmazz
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
mazmazz
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
Monster Iestyn
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
mazmazz
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
Monster Iestyn
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
MPC
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
Monster Iestyn
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
Monster Iestyn
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
Monster Iestyn
02fc845a72
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
Monster Iestyn
4089b6b8e9
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
Monster Iestyn
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
Jimita
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
MPC
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
Jimita
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
Monster Iestyn
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
880c017f8f
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
mazmazz
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
mazmazz
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
mazmazz
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
Jimita
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
Jimita
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
MPC
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
Jimita
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
MPC
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
582c5332f4
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
MPC
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
mazmazz
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -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
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
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
mazmazz
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -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
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
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
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
Steel Titanium
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
168647275c
One small change
2018-12-03 13:32:24 -05:00
mazmazz
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
