Commit graph

14445 commits

Author SHA1 Message Date
Magnus Norddahl
3f4e257d73 - move modeldef parsing to its own function (ParseModelDefLump)
- rename gl_InitModels to InitModels
- add commented out support for #include in modeldefs (blocked by gene tech having broken #include statements in its modeldef files)

(cherry picked from commit 91aec1689e)
2018-05-24 10:25:42 +02:00
Magnus Norddahl
8de520e9e1 - avoid reusing the same mVBuf pointer for the different renderers as that causes too many problems when switching between them
- remove gl_ prefix for model functions that are no longer GL specific

(cherry picked from commit 31abe3df7e)

# Conflicts:
#	src/gl/models/gl_models.h
#	src/gl/scene/gl_scene.cpp
#	src/hwrenderer/scene/hw_sprites.cpp
#	src/hwrenderer/scene/hw_weapon.cpp
#	src/hwrenderer/textures/hw_precache.cpp
2018-05-24 10:25:05 +02:00
Christoph Oelckers
3703132794 - fixed shader compilation.
(cherry picked from commit 1266339c0f)
2018-05-23 10:22:12 +02:00
Christoph Oelckers
e9f7383279 - check light direction in the shader.
There are situations where lights on the wrong side of a linedef may be passed and those need to be skipped in the shader code.

(cherry picked from commit 3dc6ddbcc3)
2018-05-23 10:22:11 +02:00
Christoph Oelckers
12a2dede7e - added CVAR to disable WGL_EXT_swap_control_tear.
At least on faster NVidia hardware, setting this to false and gl_finishbeforeswap to true gives a better experience because it reduces screen tearing - but the same setting will reduce frame rate quite dramatically on Intel and can cause bad stalls on some older GPUs when rendering camera textures.

(cherry picked from commit cc65490062)
2018-05-23 10:13:35 +02:00
Magnus Norddahl
d7f907f510 - fix model interpolation bug
(cherry picked from commit cc4a09a3d2)
2018-05-21 20:11:29 +02:00
drfrag666
0552c8fbb3 - Revert "- fixed: Change compiled exe version strings to match git repo numbers."
gitinfo.h was still being included with MinGW and it was a waste of time on every commit anyway.
2018-05-21 10:28:23 +02:00
alexey.lysiuk
4a114d363b - added new linedef properties to UDMF spec
https://forum.zdoom.org/viewtopic.php?t=59808
(cherry picked from commit ad31da20e5)
2018-05-20 14:39:11 +02:00
alexey.lysiuk
58268b383b - replaced tabs with spaces in UDMF spec
(cherry picked from commit 526711f5d8)
2018-05-20 14:39:10 +02:00
Christoph Oelckers
b0531c7293 - disable shader storage blocks if none get reported for vertex shaders.
(cherry picked from commit 3069b53804)
2018-05-20 11:20:11 +02:00
alexey.lysiuk
13d7b49eeb - added forced automap style to linedef, UDMF only
https://forum.zdoom.org/viewtopic.php?t=59808
(cherry picked from commit c6f7d92c76)
2018-05-19 21:40:46 +02:00
RockstarRaccoon
84f1720ece - added 'revealed on automap' linedef flag, UDMF only
https://forum.zdoom.org/viewtopic.php?t=59808
(cherry picked from commit 90cb0b3215)
2018-05-19 21:40:45 +02:00
Marisa Kirisame
4831b9be65 Cleaned UE1 math by using FVector classes.
Reversed winding order on vertex buffer creation as UE1 uses CCW.

(cherry picked from commit 0c4a08460f)
2018-05-19 21:38:45 +02:00
alexey.lysiuk
8bfdb2aa36 - fixed compilation warnings reported by GCC/Clang
src/r_data/models/models.cpp:418:33: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]
src/r_data/models/models.cpp:427:38: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]
src/r_data/models/models_ue1.cpp:49:37: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]

(cherry picked from commit 9257c9cc0c)
2018-05-19 21:37:10 +02:00
Rachael Alexanderson
3d86244b61 - define zdoom.rc as a proper Windows text file, stop Git from mismanaging it
# Conflicts:
#	src/win32/zdoom.rc
2018-05-18 14:01:48 +02:00
Christoph Oelckers
4811962acb - silence some warnings.
(cherry picked from commit 2962fe9f08)
2018-05-18 13:46:12 +02:00
drfrag666
986bed0475 - Keep autosaves at the top of the savegame list. 2018-05-18 13:19:53 +02:00
Rachael Alexanderson
98dc10c127 - also remove unused forward declarations
(cherry picked from commit bcadd2bf04)
2018-05-17 13:06:44 +02:00
Rachael Alexanderson
25b281659c - cleaned up vid_scaleto____ code a bit, also set a sane lower limit for vid_scalefactor, removed some code redundancy
(cherry picked from commit 0f36b9d63f)
2018-05-17 13:06:44 +02:00
Rachael Alexanderson
126dcb5a70 - added vid_scaletowidth and vid_scaletoheight to calculate vid_scalefactor to reach a certain value on screen dynamics
(cherry picked from commit 0fae13bab4)
2018-05-17 13:06:43 +02:00
Christoph Oelckers
87121e2936 - fix warnings.
(cherry picked from commit fb876852bb)
2018-05-17 13:01:32 +02:00
Marisa Kirisame
30193423a6 Fix for Unreal meshes that don't have sequential texture numbers
(cherry picked from commit 1bb00ed4f0)
2018-05-17 13:01:31 +02:00
Marisa Kirisame
e2b3dc1c74 Remove unnecessary checks.
(cherry picked from commit 98f279b651)
2018-05-17 13:01:30 +02:00
Marisa Kirisame
91acd10e75 Discarded "UMSH" packed format, now loads _d.3d + _a.3d pairs
(cherry picked from commit ffc12eec29)
2018-05-17 13:01:29 +02:00
Marisa Kirisame
08d15514d2 Add support for packed Unreal Engine 1 vertex mesh format.
(concatenated "UMSH" signature + datafile + anivfile)
This is pretty much 100% functional by now.
Hasn't been tested on platforms other than Linux yet, though.
Code definitely deserves some cleaning.

(cherry picked from commit f285e550d6)
2018-05-17 13:01:28 +02:00
drfrag666
0e25e40deb - Addressed crash on exit with MinGW. This is a hack and i've reported it as a bug in the MinGW C runtime. 2018-05-17 12:06:44 +02:00
alexey.lysiuk
f8dc707edf - fixed seeking end of file in memory reader
https://forum.zdoom.org/viewtopic.php?t=60611
(cherry picked from commit 42668c6a5a)
2018-05-17 11:57:05 +02:00
alexey.lysiuk
86eb6b8f85 - trigger WorldThingDamaged event before WorldThingDied
https://forum.zdoom.org/viewtopic.php?t=60597
(cherry picked from commit fc91827900)
2018-05-17 11:57:04 +02:00
Jonathan Russell
c8a47653bf - added LevelLocals vec2/3Offset(Z) functions for portal-aware offsetting without needing actors
(cherry picked from commit e9050a38b3)
2018-05-17 11:57:03 +02:00
alexey.lysiuk
a66686225d - fixed potential crash on startup, Windows only
At least one version of Windows SDK (10.0.17134.0) has broken _pgmptr/_get_pgmptr()
It points to an empty string for multi-byte character set applications
GetModuleFileName() is now used instead regardless of compiler/toolchain
Added extra guard against unexpected program paths to avoid crashes

https://forum.zdoom.org/viewtopic.php?t=60598
(cherry picked from commit e1e441091d)
2018-05-16 11:58:38 +02:00
drfrag666
cc397295b6 - Fixed bad merge of "- some Transfer_Heights related optimizations". 2018-05-14 23:44:33 +02:00
alexey.lysiuk
4c7261c3b6 - fixed wrong line number in error message
Parser of MAPINFO editor number definitions didn't assign line numbers, so 'Unknown actor class' fatal error displayed some garbage

(cherry picked from commit 751e318c4e)
2018-05-14 18:06:59 +02:00
drfrag666
429bd5d843 - Made VMFrameStack GlobalVMStack a non thread_local variable for MinGW since that helps to prevent crashes on exit. 2018-05-14 12:53:57 +02:00
alexey.lysiuk
c06501d7ca - use map axes in bad sound position/velocity warning
https://forum.zdoom.org/viewtopic.php?t=60578
(cherry picked from commit 8a6ae503be)
2018-05-13 19:14:01 +02:00
drfrag666
9416219ea5 - Fixed bad merge of "- Clean up PolyTriangleDrawer API" 2018-05-13 19:11:29 +02:00
drfrag666
dc8d32cb69 - Changed savegame list order, now they are sorted by reverse slot number instead of alphabetically. 2018-05-13 11:53:47 +02:00
drfrag666
108f0d3fd7 - Give an error message instead of just crashing on non SSE2 cpus. 2018-05-12 14:48:52 +02:00
drfrag
30a606ed6b - Fixed crash with textures larger than those supported by the hardware in the D3D backend.
# Conflicts:
#	src/win32/fb_d3d9.cpp
2018-05-12 14:28:58 +02:00
drfrag666
a79b9705cf - Added menu options for sprite and line distance cull. 2018-05-12 13:43:27 +02:00
alexey.lysiuk
a545e7de35 - added end line to various messages
so they don't screw up further output anymore

(cherry picked from commit f17f8c9359)

# Conflicts:
#	src/gl/compatibility/gl_swshader20.cpp
2018-05-12 11:49:10 +02:00
Magnus Norddahl
5ade87d974 - move 3d floor code into functions
(cherry picked from commit 643828f5fa)
2018-05-12 11:41:00 +02:00
Magnus Norddahl
4a390a1c27 - more pointless complexity removal
(cherry picked from commit e4d740e586)
2018-05-12 11:40:59 +02:00
Magnus Norddahl
ba6c4e4c4a - remove pointless code
(cherry picked from commit acf9f55849)
2018-05-12 11:40:57 +02:00
drfrag666
087c3b4c01 - Fixed -iwad parameter working only with VS on Windows. 2018-05-12 11:32:53 +02:00
drfrag666
d60299c740 - Fixed compilation with VS. 2018-05-11 14:22:43 +02:00
Magnus Norddahl
ee5db9963b - fixed sloped drawer crash
(cherry picked from commit b0cc472e85)
2018-05-11 12:40:27 +02:00
landfillbaby
4ad3f2ed2f fix highlighting in snd_listmididevices
(cherry picked from commit ba9a340c1f)
2018-05-10 21:58:56 +02:00
alexey.lysiuk
807820b54b - fixed crash in DECORATE parsing
The case with forward declared class used as a parent must be handled explicitly

actor MyWeapon : Weapon { Weapon.AmmoType "MyBaseAmmo" }
actor MyAmmo : MyBaseAmmo { }
actor MyBaseAmmo : Ammo { }

(cherry picked from commit ef536e7b00)
2018-05-10 21:58:55 +02:00
alexey.lysiuk
82121a0e43 - added end line to recursive sound warning
(cherry picked from commit 821cc2a140)
2018-05-10 21:58:34 +02:00
alexey.lysiuk
91d91ce84f - Cocoa: ability to use drag and drop with custom IWADs
(cherry picked from commit fd5df6e8d1)
2018-05-10 21:57:58 +02:00