Commit graph

13833 commits

Author SHA1 Message Date
Christoph Oelckers
714ada01aa Merge remote-tracking branch 'remotes/origin/qzdoom-merge' 2017-07-20 18:33:20 +02:00
Christoph Oelckers
e8e940d221 - fixed portal handling for P_CheckMissileSpawn to obey commonly established rules about portal types. 2017-07-20 18:32:54 +02:00
Christoph Oelckers
ffc529d100 - let r_*_cull variables default to 0. 2017-07-20 14:23:45 +02:00
Christoph Oelckers
03ed0656e1 - fixed: The frame timer for interpolating the renderer should always take its time from the actual beginning of the frame instead of checking the system timer in real time when rendering starts.
This fixes two issues:

* timer related texture animations are not being recreated multiple times if a scene renders multiple viewpoints (e.g. camera textures or portals.)
* interpolation is smoother when maps have a high think time of multiple milliseconds. A good map to see the difference would be ZDCMP2 which has a think time of 4-5 milliseconds. With the timer taken in real time after the thinkers have run and VSync on this resulted in alternating time slices of 11 and 21 ms between frame interpolations instead of an even 16 as should be done for smooth 60 fps because roughly every second frame was offset by those 5 ms.
2017-07-20 14:20:50 +02:00
Rachael Alexanderson
f4e0690c41 - missed one qzdoom reference 2017-07-20 06:45:08 -04:00
Rachael Alexanderson
d020ec68d2 Merge branch 'master' into qzdoom-merge 2017-07-20 06:43:03 -04:00
Rachael Alexanderson
bc38f7f776 - changed gl_ssao_portals default to 1 2017-07-20 06:41:34 -04:00
Rachael Alexanderson
77617a2757 Merge branch 'master' into qzdoom-merge 2017-07-19 17:32:41 -04:00
Rachael Alexanderson
5918167fb3 - added 'kill baddies' cheat - does the same thing as 'kill monsters' only it ignores friendly monsters 2017-07-19 15:03:27 -04:00
Rachael Alexanderson
62a4eb6b6d - fixed a comment in version.h about the current ZScript version (it was out of date) 2017-07-19 11:04:53 -04:00
alexey.lysiuk
bbb8374b06 Fixed applying of color to untranslated fonts in hardware renderer
https://forum.zdoom.org/viewtopic.php?t=57268
2017-07-19 15:00:55 +03:00
alexey.lysiuk
f4672d67bc Fixed crash when drawing untranslated font
https://forum.zdoom.org/viewtopic.php?t=57268
2017-07-19 13:24:19 +03:00
Rachael Alexanderson
1f6d15c741 - Rename QZDoom back to GZDoom again for merge. 2017-07-19 06:13:05 -04:00
Rachael Alexanderson
bac72600f0 Merge remote-tracking branch 'origin/master' into qzdoom-merge 2017-07-19 06:11:13 -04:00
Christoph Oelckers
579840987d - added per-class think time profiling tool. 2017-07-17 10:21:58 +02:00
Rachael Alexanderson
a383dacbe6 Merge https://github.com/coelckers/gzdoom 2017-07-16 01:38:25 -04:00
alexey.lysiuk
490e873602 Moved parallel_for() function template to own header file 2017-07-15 12:16:06 +03:00
Rachael Alexanderson
a3e782a164 Merge https://github.com/coelckers/gzdoom 2017-07-15 03:48:13 -04:00
Rachael Alexanderson
9eb0b64ab0 - Added new "sv_damagefactor*" variables.
sv_damagefactorplayer: Scales damage for player
sv_damagefactorfriendly: Scales damage for all other +FRIENDLY objects
sv_damagefactormobj: Scales damage for everything else (incl. monsters and decorations)
2017-07-15 03:38:10 -04:00
Christoph Oelckers
ac30e47ab4 - Added an 'srand' call to the RBG initialization.
This is needed because 'rand' gets used by parts of the sound code (e.g. playlists.)
2017-07-15 09:34:07 +02:00
Christoph Oelckers
daca12600d - fixed: The ADDA_RK opcode used the wrong constant type for the offset it adds to the pointer. 2017-07-15 09:14:39 +02:00
Christoph Oelckers
98124c8049 - avoid using plain chars as variables.
This is all I found with a quick search, there's probably more...
2017-07-15 09:01:02 +02:00
Rachael Alexanderson
c1e3f10802 Merge https://github.com/coelckers/gzdoom 2017-07-15 00:24:25 -04:00
alexey.lysiuk
970adff5e7 Use multiple threads for xBRZ upscaling
Implementation relies on Concurrency Runtime, Grand Central Dispatch aka libdispatch or OpenMP depending on their availability
2017-07-14 16:01:38 +03:00
alexey.lysiuk
ac811f99c0 Fixed uninitialized variable in XLAT parser
https://forum.zdoom.org/viewtopic.php?t=57109
2017-07-13 18:05:58 +03:00
alexey.lysiuk
c6351825b8 Enable Core Profile on macOS only when OpenGL 3.3 is available 2017-07-13 18:05:58 +03:00
Rachael Alexanderson
7728875a7f - Added 'enabled' property for PP shaders, to automatically enable them without ZScript 2017-07-13 05:57:12 -04:00
Magnus Norddahl
c38d0c1637 Merge branch 'line_distance_cull' into qzdoom
# Conflicts:
#	src/swrenderer/scene/r_opaque_pass.cpp
2017-07-12 07:11:43 +02:00
Magnus Norddahl
7d1de667be - Added r_line_distance_cull cvar that culls lines beyond the specified distance 2017-07-12 06:56:34 +02:00
Rachael Alexanderson
25900031f5 Merge https://github.com/coelckers/gzdoom 2017-07-11 06:22:51 -04:00
Rachael Alexanderson
25ab31e92c - corrected transferred sky offsets using ZDoom 2.8.1 source - the sky needed to be offset by 28 units. 2017-07-11 05:53:21 -04:00
Rachael Alexanderson
28950b8a5d - q2.1pre version 2017-07-10 13:15:52 -04:00
Rachael Alexanderson
e2744102c5 Merge https://github.com/coelckers/gzdoom 2017-07-10 11:39:46 -04:00
Rachael Alexanderson
d2c8a5c33d Revert "Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom"
This reverts commit 65bb8a5185, reversing
changes made to 619281de64.
2017-07-10 11:29:58 -04:00
Rachael Alexanderson
26355ece82 Revert "Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom"
This reverts commit 035c036eb2, reversing
changes made to 61660bf147.
2017-07-10 11:29:30 -04:00
Rachael Alexanderson
8c0706e56f Revert "Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom"
This reverts commit 56806e3243, reversing
changes made to e1a2de4989.
2017-07-10 11:26:41 -04:00
Rachael Alexanderson
04b1163188 Revert "Add a comment"
This reverts commit d2f4dd41f8.
2017-07-10 11:25:38 -04:00
alexey.lysiuk
2e33165edf Moved freeing of data stored in HUD message objects to OnDestroy() function
https://forum.zdoom.org/viewtopic.php?t=57163
2017-07-10 10:41:50 +03:00
Rachael Alexanderson
e1b4bb11ba Merge https://github.com/coelckers/gzdoom 2017-07-09 20:09:12 -04:00
Magnus Norddahl
ddd1b629c3 - Calculate globvis/r_visibility in r_utility and use it in GL and poly renderers 2017-07-09 19:01:34 +02:00
Magnus Norddahl
c8e713b067 - Remember maximized window state 2017-07-09 15:12:31 +02:00
alexey.lysiuk
afe1199b69 Fixed sound looping when stream length is a multiply of buffer size
https://forum.zdoom.org/viewtopic.php?t=57164
2017-07-09 13:28:16 +03:00
Rachael Alexanderson
15d92b346d Merge https://github.com/coelckers/gzdoom 2017-07-08 09:31:43 -04:00
Magnus Norddahl
00893763ed Merge branch 'custom_postprocess' into qzdoom 2017-07-08 14:44:30 +02:00
Magnus Norddahl
a38de996e7 - Move uniform declarations to the GLDEFS lump to make it Vulkan safe (a vulkan implementation can then declare them in an uniform block)
- Change SetUniform functions to be clearscope as they can be safely called from both play and ui
- Add PlayerInfo argument to SetUniform functions to force the modder to take network play into account
- Add enabled flag on custom postprocess shaders
- Removed custom texture support until a more clean implementation is written
2017-07-08 14:44:07 +02:00
alexey.lysiuk
58b348e75a Skip autogenerated mouse move events in Cocoa backend regardless of mode 2017-07-08 13:36:55 +03:00
alexey.lysiuk
9292b23bb4 Restore mouse position when entering GUI capture mode in Cocoa backend 2017-07-08 12:46:38 +03:00
Magnus Norddahl
a4b96f7673 - Fix linker error 2017-07-06 18:02:27 +02:00
Magnus Norddahl
69a3d10cb6 Merge branch 'custom_postprocess' into qzdoom
# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
2017-07-06 05:41:16 +02:00
Magnus Norddahl
8a0e801cb5 - Move custom postprocess shader to its own file 2017-07-06 05:36:01 +02:00