Monster Iestyn
5533c97c69
Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this)
...
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
2018-02-07 17:46:01 +00:00
Monster Iestyn
17bedfbd87
Correct backwards skies for OpenGL too
2018-02-03 21:39:36 +00:00
Monster Iestyn
e95987f4ae
Added proper support for upside-down thok barriers, in both renderers
...
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
2018-02-03 19:48:18 +00:00
Monster Iestyn
7f7b459f69
Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions
2018-02-03 18:30:49 +00:00
Monster Iestyn
c41b3a186a
Pushing all my work to make OpenGL consistent with my changes to software's sky so far
2018-02-01 22:04:04 +00:00
Monster Iestyn
d6427c4148
some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw
...
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
2018-01-29 22:05:04 +00:00
Monster Iestyn
26578a8952
More sky fixes for software:
...
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
2018-01-28 22:08:58 +00:00
Monster Iestyn
aabf2b096f
Fix skies in software being displayed backwards
...
(I'll get round to OpenGL later)
2018-01-27 19:29:41 +00:00
Monster Iestyn
2a75523be9
Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane
...
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way
I also updated or added comments to some places of the sky drawing code and related where useful
2018-01-27 19:18:17 +00:00
Alam Ed Arias
0a7dc63093
Use playersprite_t
2018-01-04 14:49:26 -05:00
Alam Ed Arias
b22ef1a85d
Merge branch 'public_next' into private
2018-01-04 14:32:27 -05:00
Alam Ed Arias
7c3c09b95d
SDL: disable check for noreturn
2018-01-04 14:29:29 -05:00
Alam Ed Arias
7b86c598fc
Undo signed mess
2018-01-04 14:26:16 -05:00
Alam Ed Arias
af76943926
MSVC2015: fixup
2018-01-02 13:22:10 -05:00
Monster Iestyn
728d27f2d5
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
# src/win32/win_vid.c
2018-01-02 17:32:24 +00:00
Alam Ed Arias
26ce50f02c
Merge branch 'master' into next
2017-12-27 19:34:28 -05:00
Alam Ed Arias
e2d257031b
GIT: ignore .vs folder
2017-12-27 19:32:59 -05:00
Alam Ed Arias
31027d1a2d
MSVC: set SubSystem on DLLs to Windows
2017-12-27 19:32:38 -05:00
Monster Iestyn
83a8a77beb
Merge branch '2.1.20-preparation' into 'next'
...
2.1.20 preparation
See merge request STJr/SRB2!215
2017-12-27 16:53:43 -05:00
Monster Iestyn
adf57fd5a5
Merge branch 'master' into next
2017-12-27 21:51:11 +00:00
Monster Iestyn
a9bc7158d6
Merge branch 'restartaudio' into 'master'
...
Add command to restart the audio system
Closes #27
See merge request STJr/SRB2!214
2017-12-27 16:47:50 -05:00
Steel Titanium
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
Alam Ed Arias
c7ca071c19
Merge branch 'master' into next
2017-12-27 15:50:31 -05:00
Monster Iestyn
a1b2c6129d
Merge branch 'respawnspecials-mobjtype-hotfix' into 'next'
...
P_RespawnSpecials mobj type hotfix
See merge request STJr/SRB2!217
2017-12-27 15:47:44 -05:00
Monster Iestyn
3af72ec79d
Merge branch 'airbob-fix-backport' into 'next'
...
Airbob fix backport
See merge request STJr/SRB2!219
2017-12-27 15:46:39 -05:00
Steel Titanium
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
Alam Ed Arias
def0c12279
Makefile: disable win_dbg for DirectDraw
2017-12-26 20:42:37 -05:00
Alam Ed Arias
f1968e5145
Disable win_dbg
2017-12-26 20:24:08 -05:00
Alam Ed Arias
faf88cf2e5
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
Alam Arias
7688aecd31
SRB2: disable Smaller Type Check for MSVC
2017-12-25 00:41:05 -05:00
Monster Iestyn
342326bdd6
Merge branch 'master' into next
2017-12-24 20:06:33 +00:00
Monster Iestyn
90093268a9
Merge branch 'addfile-netgame-fixes' into 'master'
...
"addfile" console command netgame fixes
See merge request STJr/SRB2!218
2017-12-24 15:05:03 -05:00
toasterbabe
edf7483a4c
Fix airbob sectors fucking up when below 0 z-height.
2017-12-20 21:13:24 +00:00
toasterone
893f4ed322
Merge branch 'master' into addfile-netgame-fixes
2017-12-20 20:58:45 +00:00
toasterone
da3eba505c
Merge pull request #216 from LJSonik/download-freeze-fix
...
Fix Master Server requests and player joins stopping file downloading
2017-12-20 20:52:34 +00:00
Monster Iestyn
caf56a04eb
Command_Addfile: add "too many files" and already-loaded checks and respective error messages
...
No more shall the server be kicked from their own servers for re-adding a wad by accident!
2017-12-18 21:17:37 +00:00
LJSonik
c8a68a43ec
Merge branch 'master' into download-freeze-fix
2017-12-18 21:39:16 +01:00
Louis-Antoine
824d963f58
Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix
2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7
Add a short comment to explain the newplayernum hack
2017-12-18 21:35:02 +01:00
Alam Ed Arias
e12d6f041b
Merge branch 'master' into next
2017-12-17 22:22:57 -05:00
MonsterIestyn
2c9d31bf54
Merge pull request #218 from LJSonik/resynch-fixes
...
Resynch fixes
2017-12-17 21:57:25 +00:00
LJSonik
93b0eda442
Merge branch 'master' into download-freeze-fix
2017-12-17 22:48:13 +01:00
LJSonik
e0e6853317
Merge branch 'master' into resynch-fixes
2017-12-17 22:47:23 +01:00
Monster Iestyn
fe8786b8ff
Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case
2017-12-17 20:59:24 +00:00
Monster Iestyn
cad5dc21c4
Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console.
...
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
2017-12-17 20:57:45 +00:00
Alam Ed Arias
2931f14ff8
Merge branch 'master' into next
2017-12-16 18:16:15 -05:00
Alam Arias
e314ff930d
Merge pull request #212 from SteelTitanium/window_center_fix
...
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
Alam Ed Arias
825ae325c1
Merge branch 'master' into next
2017-12-16 16:07:31 -05:00
MonsterIestyn
9a0dccda71
Merge pull request #219 from LJSonik/net-archive-fix
...
Fix missing lua_pop in ArchiveExtVars
2017-12-16 20:57:46 +00:00
Louis-Antoine
a9c580c906
Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix
2017-12-15 22:06:03 +01:00
