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
1e98e3b4f2
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
a733a29f4c
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
31301660cd
Merge branch 'master' into next
2018-11-10 14:27:27 +00:00
925a56ad98
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
e01c7ae743
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
2da335a1c4
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00:00
4b8232d777
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
b3befae143
Merge branch 'public-op-nightsbumper-fix' into 'next'
...
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS
See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
17223aa520
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn