Commit graph

665 commits

Author SHA1 Message Date
Tobias Frost
ff21ecb76d Remove not-needed examples 2016-10-10 23:00:51 +02:00
Tobias Frost
44412e4b2f Update rapidjson to trunk (8eaa122c272623ce7963dc7433ba108bc9a9809e) 2016-10-10 22:59:07 +02:00
Tobias Frost
f54323a442 .. CMake.txt and neo/idlib/precompiled.h to utilize define 2016-10-10 22:13:17 +02:00
Tobias Frost
7ab1e443e2 - Add rapdijson.cmake to find the system rapidjson
- Add D_USE_SYSTEM_RAPIDJSON (default OFF) to select system library.
2016-10-10 22:01:16 +02:00
Tim Howard
fc3fd70409 update to glew 2.0 2016-08-13 21:05:14 -04: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
3d75dbcb4a GCC compile fixes under Kubuntu 15.10 2016-07-03 22:56:29 +02:00
Robert Beckebans
9a340f3914 Renamed Flash GUI development cvars to postLoadFlash* 2016-07-03 15:33:01 +02:00
Robert Beckebans
e6f75d3336 Merge branch 'flash-tools' 2016-07-03 15:11:43 +02:00
Robert Beckebans
d3b9d238ec Merge branch 'collada-support' 2016-07-03 14:59:45 +02:00
Robert Beckebans
7296fd83b5 Added COLLADA model support to get rid of ancient LWO/ASE formats 2016-07-03 13:47:52 +02:00
Robert Beckebans
3e1d21ef34 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:24:22 +02:00
Robert Beckebans
081c848f87 envShot cleanup 2016-07-02 11:24:22 +02:00
Robert Beckebans
30f85f5b46 Merged Steel Storm 2 envShot bugfix by LordHavoc 2016-07-02 11:24:22 +02:00
Robert Beckebans
3bac15f585 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:22:04 +02:00
y2keeth
7b5fc61a51 added option to game setting to turn on or off muzzleflashes 2016-06-29 18:37:59 -04:00
y2keeth
321dda8b8f increase max_decals and deffered decals, shotgun now has full impacts 2016-06-26 21:05:41 -04:00
y2keeth
473449cf5a Merge remote-tracking branch 'refs/remotes/RobertBeckebans/master' 2016-06-26 20:49:32 -04:00
Robert Beckebans
f3c8e0748e Move worlspawn to first entry if map was read from Blender 2016-06-19 17:19:24 +02:00
Robert Beckebans
45c96fa6bc envShot cleanup 2016-06-14 10:33:50 +02:00
Robert Beckebans
b8748b59e5 Merged Steel Storm 2 envShot bugfix by LordHavoc 2016-06-13 22:29:31 +02:00
Robert Beckebans
a884b08010 Astyle 2016-05-10 09:55:37 +02:00
Robert Beckebans
c664c9e940 Save rendermodels as OBJ if postLoadExportModels is set 2016-03-16 23:18:47 +01: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
Ivan Vashchaev
3171686814 Support SDL2 GameController API
On OS X DualShock4 works perfectly
2016-02-12 20:53:24 +03:00
Robert Beckebans
7728dc3add Fullscreen effects always need to be in sRGB. close #292 2016-02-02 23:12:53 +01:00
Robert Beckebans
1275984ab8 Fixed FFmpeg Win64 static libs. fix #288 2016-01-20 19:42:55 +01:00
Robert Beckebans
f01738a429 Added missing BRDF.inc to renderprogs manifest. #286 2016-01-20 19:31:48 +01:00
Robert Beckebans
414a426b09 VS 2015 and Windows 10 support. close #261 #271 #272 2016-01-20 00:55:30 +01:00
y2keeth
5f37c213c7 Merge remote-tracking branch 'refs/remotes/RobertBeckebans/master' 2016-01-19 06:07:46 -05:00
Robert Beckebans
fa87f5465c Updated readme/release notes 2016-01-19 00:04:13 +01:00
Robert Beckebans
facc23d956 Updated embedded shaders 2016-01-18 23:23:01 +01:00
Robert Beckebans
c158a16a93 Fixed rendering of mirrors 2016-01-18 23:21:53 +01:00
Robert Beckebans
fb618feeca Always render 2D GUIs in sRGB color space 2016-01-18 22:21:32 +01:00
Robert Beckebans
8f1512dc5e Tweaked HDR tone mapping and linear RGB bugfixes 2016-01-17 12:49:04 +01:00
Robert Beckebans
d50c93f26f Added r_exposure and tweaked lighting 2016-01-14 00:59:41 +01:00
Robert Beckebans
f82b700598 Improved linear RGB lighting and added ACES tonemap 2016-01-13 20:33:16 +01:00
y2keeth
da79018740 Enables muzzle flashes
weapon world lighting enabled
2016-01-11 16:46:19 -05:00
Robert Beckebans
29f5488c89 Merge branch 'SSGI' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	base/renderprogs/interactionAmbient.pixel
	neo/renderer/OpenGL/gl_Image.cpp
	neo/renderer/RenderProgs_embedded.h
2016-01-11 19:35:34 +01:00
Robert Beckebans
05da7306d4 More SSGI and SSAO bugfixes 2016-01-11 19:00:20 +01:00
Robert Beckebans
dec7944856 SSGI and SSAO bugfixes 2016-01-10 23:47:16 +01:00
Robert Beckebans
3c9bc63f61 SSGI radiosity blur 2016-01-10 17:20:38 +01:00
Robert Beckebans
9e4b6188cc Screen Space Global Illumination first step 2016-01-09 22:24:57 +01:00
Robert Beckebans
b0f5f51f4c Bugfix 2016-01-09 20:17:09 +01:00
Robert Beckebans
e8826caae8 Hierarchical depth buffer for SSAO works 2016-01-09 16:23:49 +01:00
Robert Beckebans
d9f9db3b37 Framework for hierarchical depth buffer optimization 2016-01-09 13:38:49 +01:00
Robert Beckebans
94c28fa8ff Working Alchemy SSAO shaders 2016-01-08 19:30:21 +01:00
Robert Beckebans
8a861c7914 Render SSAO to offscreen FBO 2016-01-06 22:37:16 +01:00
Robert Beckebans
9f83e84f6f Added bilateral blur to SSAO 2016-01-02 23:59:44 +01:00
Robert Beckebans
e555e83119 SSAO experiment 2016-01-02 19:28:49 +01:00
Robert Beckebans
08c7b35fd1 Normals-only G-Buffer for screen space effects 2015-12-31 18:11:34 +01:00
Robert Beckebans
5e7e59cfe6 Updated embedded shaders 2015-12-31 13:05:51 +01:00
Robert Beckebans
ba8097a90e Revert "Enables muzzle flashes"
This reverts commit 7a2f275c17.
2015-12-31 12:34:29 +01:00
Robert Beckebans
1f81d427fa Merge branch 'SMAA' 2015-12-31 12:27:26 +01:00
Robert Beckebans
5846953302 Fixed missing multiSamples initialization for OpenGL. #276 2015-12-30 19:28:14 +01:00
Robert Beckebans
523410e8cf Merge branch 'SMAA' into HDR-linearRGB 2015-12-30 13:32:05 +01:00
Robert Beckebans
ebc3f34650 Removed black triangles when half-lambert is enabled 2015-12-30 12:46:45 +01:00
Robert Beckebans
e1195615a3 Added SMAA shaders to renderprogs manifest 2015-12-30 12:22:05 +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
a74956208e Lighting in linear RGB. One step closer to PBR 2015-12-30 11:01:57 +01:00
Robert Beckebans
195f8082b8 Merge branch 'SMAA' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	neo/renderer/RenderProgs_GLSL.cpp
	neo/renderer/RenderProgs_embedded.h
2015-12-30 10:08:25 +01:00
Robert Beckebans
cae1397d78 Disabled SWF Image channelScale export 2015-12-29 11:47:45 +01:00
Robert Beckebans
08f28edfb0 Disabled HDR MSAA support in favor of SMAA 2015-12-28 23:44:22 +01:00
Robert Beckebans
c4316b14a4 Reenabled filmic post effects 2015-12-28 23:33:39 +01:00
Robert Beckebans
127b2ed5e8 Finally, Crytek's SMAA works at leat in SMAA 1x mode 2015-12-28 23:22:58 +01:00
Robert Beckebans
0b5d931e1e SMAA debugging 2015-12-28 21:36:25 +01:00
Robert Beckebans
3bb28ab144 SMAA neighborhood blending shader 2015-12-28 13:34:39 +01:00
Robert Beckebans
794f9ae5e1 SMAA blending weight calculation shader 2015-12-28 11:42:11 +01:00
Robert Beckebans
43b0cb2415 SMAA edge detection shader 2015-12-27 17:45:41 +01:00
Robert Beckebans
e332dd07d6 SMAA step one 2015-12-26 16:11:47 +01:00
Robert Beckebans
e8c8aa4795 Added SMAA intrinsic helper images 2015-12-26 15:20:19 +01:00
Robert Beckebans
6aa87784a3 Tweaked HDR/ambient 2015-12-25 12:03:59 +01:00
Robert Beckebans
a501209c8b Updated shaders. Merry Christmas :) 2015-12-24 18:49:25 +01:00
Robert Beckebans
ad0ff8ec8d Tweaked HDR/ambient 2015-12-24 18:47:16 +01:00
Robert Beckebans
5556231d71 Tweaked HDR parameters 2015-12-24 18:47:16 +01:00
Robert Beckebans
6c4ebf6a75 Added ambient pass to make game less dark 2015-12-24 18:47:16 +01:00
Robert Beckebans
5ed5b81161 Updated readme and release notes 2015-12-24 14:18:05 +01:00
Robert Beckebans
29d4a75401 Updated embedded shaders 2015-12-24 13:08:16 +01:00
Robert Beckebans
da7eedf04d Added filmic post process effects 2015-12-23 13:53:21 +01:00
Robert Beckebans
a38bfe949e Fixed renderprogs _manifest.lua 2015-12-22 18:03:44 +01:00
Robert Beckebans
5e2f7375ac Tweaked chromatic burning bloom 2015-12-22 17:53:18 +01:00
Robert Beckebans
3738e59283 Embedded shaders 2015-12-21 14:46:28 +01:00
Robert Beckebans
79f1071322 listImages bugfixes 2015-12-21 14:28:30 +01:00
Robert Beckebans
f7fc5b59ab Misc linear RGB experiments 2015-12-21 14:12:03 +01:00
Robert Beckebans
b3dc4c99fb listImages bugfixes 2015-12-21 13:27:53 +01:00
Robert Beckebans
a378e73823 Merge remote-tracking branch 'RBDOOM-3-BFG/gamma-correction' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	neo/renderer/tr_local.h
2015-12-21 13:27:12 +01:00
Robert Beckebans
51cac2394f Merge branch 'master' into gamma-correction 2015-12-21 13:00:52 +01:00
Robert Beckebans
f64b7b80d4 HDR framebuffer resize bugfix 2015-12-21 12:11:56 +01:00
Robert Beckebans
2d8a0b3536 Tweaked tone mapping and implemented r_hdrDebug view 2015-12-21 11:39:19 +01:00
Robert Beckebans
37005ba506 64 bit HDR with adaptive tone mapping ported from XreaL 2015-12-20 12:28:46 +01:00
y2keeth
61879bf8b9 Update RenderSystem.h 2015-12-10 06:50:42 -05:00
y2keeth
ff710a7e34 Update RenderSystem.cpp 2015-12-10 06:50:05 -05:00
y2keeth
ac55df9347 Update RenderSystem_init.cpp
Changed extension check for GL_ARB_framebuffer_object
2015-12-10 06:16:08 -05:00
Robert Beckebans
1c14ab2db9 Changed extension check for GL_ARB_framebuffer_object 2015-11-23 14:42:01 +01:00
Robert Beckebans
be030e5548 Workarounds for Mesa. closes #256 #245 2015-11-23 14:01:59 +01:00
y2keeth
a2ed7f250a FFMep 2.9 dll's again lol 2015-11-17 19:11:24 -05:00
y2keeth
91d1504cec Revert "FFMpeg 2.9 dll's"
This reverts commit 08da02292f.
2015-11-17 19:07:02 -05:00
y2keeth
03e98bbbe6 glsl creation fix
glsl creation for Mesa drivers fix
2015-11-17 18:56:06 -05:00
y2keeth
08da02292f FFMpeg 2.9 dll's 2015-11-17 18:54:08 -05:00
BielBdeLuna
a25dcdcd30 glsl creation fix 2015-11-17 12:46:45 +01:00
y2keeth
374a850fba Patch from Debian #803857 to support ffmpeg 2.9 2015-11-07 12:02:59 -05:00
y2keeth
ee0d697764 Merge remote-tracking branch 'refs/remotes/RobertBeckebans/master' 2015-11-07 11:31:08 -05:00
y2keeth
1ce8a30544 unlocked softshadows for mesa-Intel drivers
by BielBdeLuna
2015-11-03 20:17:30 -05:00
Robert Beckebans
4b1f6cfaf3 Defaulted fs_resourceLoadPriority to 0 2015-10-28 18:35:56 +01:00
Robert Beckebans
25764b07ad JSON Flash image reimport 2015-10-28 18:35:41 +01:00
Robert Beckebans
db560ecd7b JSON Flash improved reimport 2015-10-28 18:35:41 +01:00
Robert Beckebans
c552d8108c JSON Flash mainsprite reimport 2015-10-28 18:35:41 +01:00
Robert Beckebans
2398006cc6 JSON -> Flash Tag_RemoveObject2, Tag_DoAction 2015-10-28 18:35:41 +01:00
Robert Beckebans
cd084649c6 Merge remote-tracking branch 'RBDOOM-3-BFG/master' 2015-10-22 23:49:12 +02:00
Robert Beckebans
ab354c0ceb Defaulted fs_resourceLoadPriority to 0 2015-10-22 23:48:38 +02:00
Robert Beckebans
a1d97245b9 Fixed merge conflicts 2015-10-12 13:02:18 +02:00
Robert Beckebans
45d475936f JSON -> Flash Tag_PlaceObject3 2015-10-12 12:36:31 +02:00
Robert Beckebans
c5545bf8f2 JSON -> Flash bugfixes 2015-10-12 12:36:31 +02:00
Robert Beckebans
d769620288 JSON Flash sprite import xform color 2015-10-12 12:36:31 +02:00
Robert Beckebans
0792ac0f59 JSON Flash sprite import 2015-10-12 12:36:31 +02:00
Robert Beckebans
6073793ee5 Exported Flash line draws to JSON 2015-10-12 12:36:31 +02:00
Robert Beckebans
09c1905fea Continued RapidJSON Flash import 2015-10-12 12:36:31 +02:00
Robert Beckebans
cdb2047900 RapidJSON Hello World 2015-10-12 12:36:30 +02:00
Robert Beckebans
cec8cb2d45 Added RapidJSON 1.0.2 2015-10-12 12:35:43 +02:00
Robert Beckebans
a7472618a7 swf_show debug rendering 2015-10-12 12:35:43 +02:00
Robert Beckebans
d4eb9f8d93 swf_show debug rendering 2015-10-12 12:35:43 +02:00
Robert Beckebans
6d4a3f107b JSON Flash export 5 2015-10-12 12:35:43 +02:00
Robert Beckebans
17f3059d64 JSON Flash export 4 2015-10-12 12:35:43 +02:00
Robert Beckebans
5ddcb22a15 JSON Flash export 3 2015-10-12 12:35:43 +02:00
Robert Beckebans
30e5e52f71 JSON Flash export 2 2015-10-12 12:35:43 +02:00
Robert Beckebans
aa3f3aef71 JSON Flash export 1 2015-10-12 12:35:42 +02:00
Robert Beckebans
21de748801 Flash bytecode to Lua 2015-10-12 12:34:55 +02:00
Robert Beckebans
71e339a83b Partial Flash bytecode to ActionScript export 2015-10-12 12:34:55 +02:00
Robert Beckebans
8b99afd5c1 Changed SWF export dir to base/exported/ 2015-10-12 12:34:55 +02:00
Robert Beckebans
a353c3f233 SWF shapes export 2015-10-12 12:34:55 +02:00
Robert Beckebans
dd056c4ecc SWF shapes export 2015-10-12 12:34:55 +02:00
Robert Beckebans
038f798f88 SWF shapes export 2015-10-12 12:34:54 +02:00
Robert Beckebans
e14b1fff08 SWF sprites export 2015-10-12 12:34:54 +02:00
Robert Beckebans
e19e0a6911 SWF image export 2015-10-12 12:34:53 +02:00
Robert Beckebans
f8f1264eb4 More work on SWF images export 2015-10-12 12:34:53 +02:00
Robert Beckebans
edd5ccb9b9 Prepaired SWF images export 2015-10-12 12:34:52 +02:00
Robert Beckebans
54b2753025 SWF export empty .swf 2015-10-12 12:34:52 +02:00
Robert Beckebans
b952f3c594 SWF export 2015-10-12 12:34:51 +02:00
Robert Beckebans
9c58fdf6f9 Added swf_exportAtlas 2015-10-12 12:33:32 +02:00
Robert Beckebans
4502588338 Improved XSWF output 2015-10-12 12:33:31 +02:00
Robert Beckebans
d4a53e6b49 Fixed crash 2015-10-12 12:33:31 +02:00
Robert Beckebans
15fe2a2ae6 Added swf_skip* cvars 2015-10-12 12:33:30 +02:00
Robert Beckebans
ebd9df1202 Extended Shape-Command exports 2015-10-12 12:33:30 +02:00
Robert Beckebans
83c76f576d XML Flash bugfixes 2015-10-12 12:32:49 +02:00
Robert Beckebans
e4c0d05b7e XML Flash almost done 2015-10-12 12:32:49 +02:00