Commit graph

130 commits

Author SHA1 Message Date
Robert Beckebans
b85db1e865 Merged stuff from Iced-Hellfire-Dev branch, no specular fix 2021-02-20 12:56:24 +01:00
Robert Beckebans
c0376eacaf Merged some smaller bugfixes from Stephen's branch 2021-02-20 12:03:11 +01:00
Robert Beckebans
a6bf995acc Fixed exportFGD to make func_static dynamic for model loading 2021-02-16 18:36:24 +01:00
Robert Beckebans
7b65cb4959 Added exportFGD models parameter 2021-02-15 23:06:58 +01:00
Robert Beckebans
ac84ab968d Allow dmap to have lights with no names 2021-02-15 19:28:39 +01:00
Robert Beckebans
742624d3ac Added support for the Valve 220 .map format in dmap 2021-02-13 18:46:34 +01:00
Robert Beckebans
99bd1bffb0 Sync with D3 branch from last weekend 2021-02-10 17:42:51 +01:00
Robert Beckebans
19e207b893 Exporting to OBJ also supports .md5mesh now 2021-02-10 17:42:51 +01:00
Robert Beckebans
1867452c40 Export OBJ files along with exportFGD command 2021-02-10 17:42:51 +01:00
Robert Beckebans
4d7468e812 Improved exportFGD command 2021-02-10 17:42:50 +01:00
Robert Beckebans
f35840914c Added cmd to export entity defs to TrenchBroom FGD 2021-02-10 17:42:50 +01:00
Robert Beckebans
05a3e049c5 Hack by BFA to avoid problem with decl load in game thread 2020-11-26 20:40:03 +01:00
Robert Beckebans
d3bc29d510 Added GPU timer queries for Vulkan 2020-05-05 01:21:29 +02:00
Robert Beckebans
14a331fadd Made ImGui to work with the Vulkan builds 2020-05-04 17:22:51 +02:00
Robert Beckebans
33a232a840 Prevent vanilla .resource maps to be reloaded. Pull request #477 2020-05-03 15:58:51 +02:00
Robert Beckebans
9fb3f686a1 Updated README with some documentation about the modding support 2020-03-31 21:01:44 +02:00
Robert Beckebans
33129bf5b8 Fixed game time stats 2020-03-29 18:19:03 +02:00
Robert Beckebans
62466b41b7 Use ImGui to draw renderer stats for com_showFPS 1 2020-03-29 17:12:11 +02:00
Robert Beckebans
2bcd5e98a8 Version bump 1.3.0 to differentiate from latest public build 2020-03-22 13:51:30 +01:00
Robert Beckebans
08cb9730e3 Merge branch 'master' into vulkan 2019-11-19 21:29:16 +01:00
Robert Beckebans
4a6af2d609 Applied new Astyle settings 2019-11-11 20:27:44 +01:00
Jeffrey N. Johnson
07aa70f27e These changes allow the use of C++11. 2019-11-10 12:33:53 -08:00
Robert Beckebans
2c07265be5 Merge branch 'master' into IBL-environment-probes2 2019-10-30 10:38:44 +01:00
Robert Beckebans
1c9674e931 ImGui integration bugfixes 2019-10-28 15:39:00 +01:00
Robert Beckebans
a3e8b52170 Ported ImGui light editor from OpenTechBFG 2019-10-28 15:39:00 +01:00
Robert Beckebans
3709713d79 Solved IBL branch conflicts 2019-10-19 22:51:14 +02:00
Robert Beckebans
1e4292e52a Merged LordHavoc's image compression progress bar 2019-10-19 22:22:24 +02:00
Robert Beckebans
3f7cf5387d Version bump to 1.2.0 2019-10-14 20:11:58 +02:00
Robert Beckebans
d634243631 Don't convert JSON map files to JSON again. Only .map to .json 2018-11-03 14:36:03 +01:00
Robert Beckebans
98a13a2424 Generate vkGLSL if Vulkan is running otherwise GLSL 4.50 2018-10-07 16:42:28 +02:00
Robert Beckebans
4edf8b1c3b Added AMD's Vulkan Memory Allocator library 2018-10-06 17:55:32 +02:00
Robert Beckebans
a8ae629fcf Merged more renderer backend code from vkneo 2018-10-06 17:21:49 +02:00
Robert Beckebans
ee4ade8c11 Merge branch 'master' into vkdoom3-merge 2018-06-05 11:49:51 +02:00
Robert Beckebans
d75169010b
Merge pull request #382 from ensiform/x64-staticvar-fix
Static cvars incorrectly checking against wrong size on 64
2017-11-17 12:02:51 +01:00
Robert Beckebans
5c4764197a com_smp -1 mode for RenderDoc debugging 2017-09-10 17:28:27 +02:00
Robert Beckebans
38bcf14c7b killed globalImages->BindNull(). More cleanups from vkneo 2017-09-10 15:27:31 +02:00
Robert Beckebans
c91f8f4338 Merge branch 'master' into vkdoom3-merge 2017-09-03 10:32:19 +02:00
Robert Beckebans
e22837309b Merged LordHavoc's image compression progress bar
# Conflicts:
#	neo/framework/common_frame.cpp
2017-09-03 10:30:13 +02:00
Robert Beckebans
736ccadcb3 Started to move files so it can be compared to vkdoom3 2017-09-03 10:22:36 +02:00
Ensiform
29786cf420 Static cvars incorrectly checking against wrong size on 64
On 64-bit arch these checks are incorrect. the 0xFFFFFFFF is effectively UINT32_MAX rather than the pointer size. Changing to the unsigned integral pointer maximum seems like a better idea.

Fixes the warning, and corrects the code.
2017-07-30 22:30:25 -05:00
Jonathan Young
5368af9ad8 Fix playDemo running as fast as possible (like timeDemo). 2016-07-16 11:24:06 +10:00
Jonathan Young
ca0527f9a6 Merged Storm Engine 2 demo fixes. 2016-07-15 16:36:34 +10:00
Jonathan Young
42f93f5b0e Include json maps in command argument auto-complete. 2016-07-04 19:14:16 +10:00
Jonathan Young
9325c3672c Fix debug assert when auto-completing some command arguments. 2016-07-04 19:12:58 +10:00
Robert Beckebans
95de9c62a5 exportDecls command to export def/* stuff for Blender 2016-03-05 21:19:14 +01:00
Robert Beckebans
52b7775d83 Added support for new JSON based map format 2016-03-05 20:52:09 +01:00
Robert Beckebans
be556174e0 Merge branch 'master' into map-primitive-polygons-for-blender 2016-03-05 20:20:07 +01:00
Robert Beckebans
fa87f5465c Updated readme/release notes 2016-01-19 00:04:13 +01:00
Robert Beckebans
e2e4295556 Replaced r_multiSamples with r_antiAliasing to switch between SMAA, MSAA ( and TXAA future) 2015-12-30 12:07:24 +01:00
Robert Beckebans
5ed5b81161 Updated readme and release notes 2015-12-24 14:18:05 +01:00