de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
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
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
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
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
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
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
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
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
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
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
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
6d9fb0d3fd
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
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
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
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
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
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
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
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
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
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
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
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
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
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
168647275c
One small change
2018-12-03 13:32:24 -05:00
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
7ce092128b
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 9de31cf2e7
2018-12-03 13:11:48 -05:00
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
ed57d0d9f9
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
9de31cf2e7
Make pause key bring up the menu if it's a joy button
...
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
06faf6ffe4
Unneeded input header in st_stuff
2018-12-03 12:36:42 -05:00
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
6c78af3542
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
3d8bc85494
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
5314c0e36b
Make F12 spectator string constant because of wrapping issues
2018-12-03 12:13:36 -05:00
60b16289e5
Change spectator string for "Press F12 to watch"
2018-12-03 12:11:03 -05:00
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
978a28004d
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
10832db244
Merge branch 'next' into lua_mapchange
2018-12-02 20:54:32 +00:00
a63ba7084a
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
...
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
ce4e63a366
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
2018-12-02 17:12:05 +00:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
e12890c84e
s
2018-12-02 09:08:05 -06:00
2af04203ea
Fix a dumb mistake
2018-12-02 08:57:35 -06:00
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
e0a1c43813
Free lump names *before* either lumpinfo or the WAD itself!
2018-11-30 14:19:47 +00:00
bc1f08f89d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
c5e8e0badb
Merge branch 'master' into tiny-makefile-fix
2018-11-29 21:57:47 +00:00
305ad4f73e
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
2018-11-29 14:16:02 +00:00
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
d294be2054
Fix a quick merge mistake.
2018-11-29 07:15:54 -06:00
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
e158206e55
backport string len tweaks I made to LUA_LoadLump in internal
2018-11-27 23:06:31 +00:00
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
6e839d30a2
Merge branch 'master' into next
2018-11-27 15:31:28 +00:00
95e13d9ad3
Merge branch 'save-soundmenu-toggles' into 'master'
...
Save sound toggles to config
See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
1889c36dea
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
2018-11-27 13:57:32 +00:00
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
a2678dcb2e
Merge branch 'public-nights-invertloopfix' into 'next'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
fd891aa21d
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
4b0d45afd8
Merge branch 'opengl-noloading' into 'master'
...
Hide OpenGL loading screen
See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
a71ca1d259
Merge branch 'fof-slope-skew-backport' into 'master'
...
FOF wall slope skewing backport
See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
aaabf062b8
Merge branch 'ms-cvars-fix' into 'master'
...
Update server name insantly
See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00
5069acb110
Merge branch 'mpc-software-yslope-fix' into 'master'
...
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
028236006b
Merge branch '21-copyright-followup' into 'master'
...
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
2018-11-25 11:07:34 -05:00
8b4a64ac05
Merge branch 'last-min-cleanup' into 'master'
...
Last min cleanup
See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00
11cb2e05ba
Merge branch 'cmake-use-internal-libs' into 'master'
...
CMake: Use internal libs.
See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
85305791d8
Merge branch 'objectplace-skybox-fix' into 'next'
...
Objectplace skybox fix.
See merge request STJr/SRB2!319
2018-11-25 09:30:16 -05:00
e4d7ba39a9
Whitespace
2018-11-25 08:17:57 -05:00
83531469d7
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
bd4743007e
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
d7b3cf9314
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
b48c1d1ce6
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
...
# Conflicts:
# src/w_wad.c
2018-11-25 11:18:28 +01:00
32a9e40baa
Progress?
...
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:11:50 +01:00
7c44054aa3
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
f3ea628fea
Update server name instantly on change
2018-11-24 21:24:05 -05:00
1113849f5c
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
ec67c4cbd6
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
1bcfe16933
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
4ac481bcc6
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
a1fb333e9b
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
f80691eb6e
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 3b298b7c42
2018-11-24 15:36:50 -05:00
c1d4ef3296
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
148d8ec9e0
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
17528a6aa9
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
cb0c31fa9a
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
3b298b7c42
Adjust mouse scaling calculation for SDL in windowed mode
2018-11-23 21:43:50 -05:00
b60c10dc9b
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
794d27b49e
Kill CheckMissileImpact, it has been useless for probably a decade and a half
2018-11-23 23:14:49 +00:00
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
d228e35fcb
Merge branch 'responsefile-fix' into 'master'
...
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
97dd291f3f
Merge branch 'master' into responsefile-fix
2018-11-23 15:29:52 -05:00
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
...
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
3d0fd7ff2e
Merge pull request #258 from light2yellow/master
...
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
08af33c51f
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
3c95a63fc2
Merge branch 'public-darker-credits' into 'master'
...
Make the credits pics darker
See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
37c0e646e4
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
3acc312923
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
797f9d180e
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
09f9572a8f
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
fb08950c19
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
2018-11-14 16:32:57 -05:00
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
97fd69951a
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
de5b626520
Fix misleading indentation
2018-11-14 11:06:45 -05:00
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
938bf1605c
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
8777d5c6c9
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
51768e7dd1
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
2ca5e29110
Make sure the new option only works on Windows.
...
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
302358c403
Merge branch 'mixer-sound-x64-fix' into 'master'
...
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
9029cf5d9c
Fix skybox disappearing after using objectplace command
2018-11-13 17:25:42 -05:00
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
e9fe0ebae1
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
2018-11-13 18:14:59 +00:00
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
e85f73117c
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
2018-11-12 20:07:45 +00:00
63ba59341b
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
2018-11-12 16:23:59 +00:00
eb4a72440a
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03:00
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
c7e58b7cd5
Merge branch 'opengl-new-clipping-backport' into 'master'
...
OpenGL new clipping backport
See merge request STJr/SRB2!315
2018-11-10 13:57:16 -05:00
46b58cba55
Merge branch 'alias-recursion-hotfix' into 'next'
...
Alias recursion hotfix
See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
51df32dd3d
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03:00
323c89dbaf
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
dd83652b71
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
8ba0f2a177
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
c4569e61a8
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
mazmazz