Commit graph

12320 commits

Author SHA1 Message Date
nashmuhandes
59103868ce Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-03-12 12:42:55 +08:00
Magnus Norddahl
2b9a970402 Fix default palette for voxel BGRA slab data and support translated 8-bit slab data in true color mode 2017-03-12 12:42:44 +08:00
Christoph Oelckers
447e0b0c0d - Added a check to allow shader storage buffers on GL 4.3 Intel drivers. It doesn't work if GLSL version is set to 4.0 and the feature activated via extension. 2017-03-12 12:42:37 +08:00
Rachael Alexanderson
bfc8c614a0 - Forbade return scripts from triggering on save load. 2017-03-11 17:39:57 -05:00
Magnus Norddahl
38ad6ce6b7 Fix ssao being applied to skybox portals 2017-03-11 17:20:06 +01:00
Christoph Oelckers
355bbf4829 - removed debug output from recent translation additions. 2017-03-11 14:58:59 +02:00
alexey.lysiuk
b8ba2d20e5 Do not draw crosshair on automap with alternative HUD enabled 2017-03-11 14:58:33 +02:00
nashmuhandes
cea6091c88 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom-gpl 2017-03-11 01:32:44 +08:00
Rachael Alexanderson
65d67b704c Merge ../qzdoom 2017-03-10 12:07:55 -05:00
Rachael Alexanderson
a4ba32342b Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_plane.cpp
2017-03-10 11:57:41 -05:00
nashmuhandes
c0fc53b54a Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_plane.cpp
2017-03-11 00:39:29 +08:00
Magnus Norddahl
d637ee5624 Fix span dynamic light rendering glitch 2017-03-10 16:23:16 +01:00
Magnus Norddahl
1996c1bc0b Fix crash HOM effect when vid_hw2d is off 2017-03-10 15:40:33 +01:00
Magnus Norddahl
2f2dcaf5fe Fix crash when vid_hw2d is off 2017-03-10 15:40:15 +01:00
Christoph Oelckers
f1630cebf3 - backported Line_Align... fix. 2017-03-10 12:09:15 +01:00
Christoph Oelckers
5b9fece062 - fixed bad definition of FBlockThingsIterator.Next(). When implementing the BlockLinesIterator apparently some incorrect code got modified.
- fixed an uninitialized variable in P_CheckSight.
2017-03-10 10:38:30 +01:00
nashmuhandes
f87f149f91 Merge branch 'master' of https://github.com/nashmuhandes/GZDoom-GPL 2017-03-10 17:25:54 +08:00
nashmuhandes
8abb4a861a Updated voxel drawer licensing info. 2017-03-10 17:21:40 +08:00
nashmuhandes
2b82758c8f Revert "Removed irrelevant voxel code notice in the README (the software renderer doesn't even exist in the current iteration)"
This reverts commit 361feaaadc.
2017-03-10 17:18:54 +08:00
Nash Muhandes
37640b0882 Update Readme.md 2017-03-10 17:17:16 +08:00
nashmuhandes
fd7bf42ba6 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-03-10 16:55:34 +08:00
Rachael Alexanderson
cb9f2e2eb0 - fixed: P_AlignFlat's y-offset data was ignored when calculating plane offsets for the final render 2017-03-10 00:18:20 -05:00
Rachael Alexanderson
84460d2f84 Merge ../qzdoom 2017-03-09 19:37:29 -05:00
Rachael Alexanderson
62bd4a360b - Fixing r_voxel's license. 2017-03-09 19:34:33 -05:00
Rachael Alexanderson
0d5cb0536e - enable multiprocessor compilation with MSVC++ using /MP for MSBuild
- Target NEON processors for ARM.
2017-03-10 00:44:25 +01:00
Rachael Alexanderson
df8d59cbc5 Merge ../qzdoom 2017-03-09 18:19:46 -05:00
Rachael Alexanderson
022d9b3949 - enable multiprocessor compilation with MSVC++ using /MP for MSBuild
- Target NEON processors for ARM.
2017-03-09 18:08:09 -05:00
Rachael Alexanderson
b1c7913400 - fix compiling issue. It compiles. It runs. Beyond that - not 100% sure. (Used GZDoom's 3.0_work branch version of win32gliface.cpp) 2017-03-09 17:48:13 -05:00
Rachael Alexanderson
dfb4e1c3a6 Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/win32/win32gliface.h
#	src/win32/win32iface.h
2017-03-09 17:11:03 -05:00
Christoph Oelckers
609e4c78b4 - fixed: NOINFIGHTSPECIES checked the wrong target actor. 2017-03-09 18:44:32 +01:00
Christoph Oelckers
f8391ce97e - there was something missing... 2017-03-09 17:44:00 +01:00
Christoph Oelckers
3113faedcf - fixed bad syntax. 2017-03-09 17:42:25 +01:00
Christoph Oelckers
878e6015df - made all iterator classes natively abstract so that they do not get a ConstructNative method so that OP_NEW can refuse creating them without the need to mark them as abstract.
- block creation of actors with the 'new' instruction. Unlike the above these cannot be made abstract because without ConstructNative they cannot be serialized.
2017-03-09 17:21:37 +01:00
Christoph Oelckers
20c56f6dda - added SectorTagIterator and LineIDIterator script classes. 2017-03-09 17:05:51 +01:00
Christoph Oelckers
420f71fc4f - added a BlockLinesIterator script class. 2017-03-09 16:45:48 +01:00
ZZYZX
4dd1910d6d Fixed the size of the local params array for WorldTick/UiTick 2017-03-09 15:38:49 +01:00
ZZYZX
5eb20b7877 Removed Create, CreateOnce, Register, Unregister from the C++ side as well 2017-03-09 15:38:49 +01:00
ZZYZX
01561eb768 Added: UiTick in EventHandlers, a callback that executes at 35fps on every handler in ui scope;
Removed: RenderOverlay, RenderFrame (commented out), Create, CreateOnce, Register, Unregister (completely)
2017-03-09 15:38:49 +01:00
Christoph Oelckers
e080f0cf89 - removed Windows.h include from gl_system.h and cleaned up that file. This means that most OpenGL sources can now be compiled without any Windows dependencies, which is significantly faster. 2017-03-09 13:19:51 +01:00
Christoph Oelckers
396c570a96 - moved Win32GLVideo's definition into the .cpp file, because it isn't needed anywhere else. 2017-03-09 13:09:38 +01:00
Christoph Oelckers
05919a2926 - remove Windows includes from gl_load.h
This is one of two places that unconditionally pulled in all Windows headers into the GL code.
We also do not need the cruft for defining the standard integer types. GZDoom is C++11 which means that stdint.h will be present. So the madness with the definitions should be avoided to ensure that the types are always the same.
2017-03-09 13:03:49 +01:00
Christoph Oelckers
03e1cbcfc0 - removed Windows types from several files which don't need them.
- split out the software renderer's video classes into their own file because they got included by all OpenGL sources.
2017-03-09 12:52:31 +01:00
Christoph Oelckers
8bd9c5a983 - moved some ACS enums from p_acs.h to p_acs.cpp.
There is really no point including this in multiple files if only one of them actually uses these constants.
2017-03-09 09:49:07 +01:00
Christoph Oelckers
77bac4f6fa - fixed code generation for min/max when the first operand was a local variable or constant.
The code for constants was not optimal because the first operand of the instructions cannot be constant. This was solved by swapping it with the second choice which will always be non-constant.
The code for local variables did not allocate a new destination register and would overwrite the first parameter's variable.
2017-03-09 09:36:12 +01:00
Rachael Alexanderson
92e55f89d2 Merge https://github.com/nashmuhandes/gzdoom-gpl 2017-03-08 22:33:25 -05:00
Rachael Alexanderson
3967afa551 Merge ../qzdoom
# Conflicts:
#	src/oplsynth/dosbox/opl.cpp
#	src/oplsynth/mlopl.cpp
#	src/oplsynth/mlopl_io.cpp
#	src/oplsynth/music_opl_mididevice.cpp
#	src/oplsynth/music_opldumper_mididevice.cpp
#	src/oplsynth/muslib.h
#	src/oplsynth/nukedopl3.h
#	src/oplsynth/opl_mus_player.cpp
#	src/sound/fmodsound.cpp
#	src/sound/fmodsound.h
2017-03-08 21:36:58 -05:00
Rachael Alexanderson
4d70b01da5 - followed through with GZDoom's SQWORD removals. 2017-03-08 21:35:20 -05:00
Rachael Alexanderson
cc9a2e5121 Merge https://github.com/coelckers/gzdoom 2017-03-08 21:25:24 -05:00
Magnus Norddahl
279fa7e886 Non-SSE version of the sky drawers 2017-03-08 23:35:13 +01:00
Christoph Oelckers
a632fae33f - for some reason the change to c_expr.cpp got lost.
- moved NO_SANITIZE to autosegs.h, because it's the only place where it is used.
2017-03-08 21:14:21 +01:00