Commit graph

12355 commits

Author SHA1 Message Date
Rachael Alexanderson
b550079a41 Merge branch 'maint-1.3' of https://github.com/raa-eruanna/qzdoom into qzdoom-current 2017-03-13 08:20:38 -04:00
Rachael Alexanderson
eb5d56b0d9 - fixed: typo 2017-03-13 08:19:59 -04:00
Rachael Alexanderson
d152719e9e Merge https://github.com/nashmuhandes/gzdoom-gpl into qzdoom-current 2017-03-13 08:18:49 -04:00
Rachael Alexanderson
9bb0844a7f Merge branch 'maint2.4' of https://github.com/coelckers/gzdoom into maint-1.3 2017-03-13 06:47:26 -04:00
ZZYZX
0176c29ec2 Will not emit OP_SCOPE if self type can be checked at compile time. 2017-03-12 20:27:38 +01:00
ZZYZX
91e83bf3c6 Fixed DECORATE scope for duplicates 2017-03-12 20:27:38 +01:00
ZZYZX
bd889cc8f1 Fixed various virtualscope oddities; set scope for DECORATE classes to play. 2017-03-12 20:27:38 +01:00
alexey.lysiuk
23130678a1 Fixed compilation errors and warnings in Mac PowerPC target
Tested with GCC 5.2 on 10.4 (32-bit only) and Clang from Xcode 8.2 on 10.12 (64-bit only)
2017-03-12 16:27:02 +02:00
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
fafd2712e0 Merge ../qzdoom 2017-03-11 18:08:09 -05:00
Rachael Alexanderson
ece0862e5f Merge https://github.com/coelckers/gzdoom 2017-03-11 17:50:34 -05:00
Rachael Alexanderson
bfc8c614a0 - Forbade return scripts from triggering on save load. 2017-03-11 17:39:57 -05:00
Rachael Alexanderson
df5b685950 - Forbade return scripts from triggering on save load. 2017-03-11 17:34:05 -05:00
Magnus Norddahl
ca75777a70 Fix default palette for voxel BGRA slab data and support translated 8-bit slab data in true color mode 2017-03-11 14:51:32 -05:00
Christoph Oelckers
14e9c37a6f - 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-11 14:20:14 -05:00
Rachael Alexanderson
e4ff812424 Merge https://github.com/coelckers/gzdoom 2017-03-11 14:19:50 -05:00
Rachael Alexanderson
684fbb2233 Revert "- fixed: enable shadow maps on Intel cards if it is otherwise supported."
This reverts commit 70e80c152b.
2017-03-11 14:19:32 -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
Rachael Alexanderson
70e80c152b - fixed: enable shadow maps on Intel cards if it is otherwise supported. 2017-03-11 01:05:56 -05:00
Magnus Norddahl
818fcfea10 Merge remote-tracking branch 'qzdoom/shadowmaps' into qzdoom
# Conflicts:
#	wadsrc/static/language.enu
2017-03-10 22:31:17 +01:00
Magnus Norddahl
b407ea2164 Change gl_light_shadowmap to default to being off 2017-03-10 22:12:13 +01:00
Magnus Norddahl
59ec97d2d5 Fix shadow map acne and the attenuate flag 2017-03-10 22:08:55 +01:00
Magnus Norddahl
b660493051 Add menu option for disabling shadow maps and detecting if storage buffers are available or not 2017-03-10 19:10:40 +01: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