id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 15:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
768 commits 1 branch 0 tags 87 MiB
Commit graph

625 commits

Author SHA1 Message Date
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
Robert Beckebans
87283f7a70 XML Flash part 2 2015-10-12 12:32:48 +02:00
Robert Beckebans
f7fbfa09f6 XML Flash part 1 2015-10-12 12:32:48 +02:00
y2keeth
f572b942f3 fs_resourceLoadPriority defaulted to 0 2015-10-09 09:56:36 -04:00
y2keeth
c4e4ff207f Increase vertex memory for custom model content 2015-10-09 09:50:57 -04:00
y2keeth
7a2f275c17 Enables muzzle flashes 2015-10-09 09:45:45 -04:00
Daniel Gibson
0fbf83fa49 Implemented Sys_[SG]etClipboardData() for SDL backend 
SDL2 only, SDL1.2 doesn't have functions to handle the clipboard
 2015-08-02 19:23:26 +02:00
Daniel Gibson
255d135a6c Fix crash when running dmap on existing map 
Loading the collision model from binary can fail, but this wasn't
checked, so idCollisionModelManagerLocal::models[i] could contain NULL
which causes crashes later.
 2015-08-01 05:18:12 +02:00
Robert Beckebans
6f3fe59b68 Merge branch 'master' into gamma-correction 2015-07-22 12:32:23 +02:00
Robert Beckebans
af2c6b4326 Merge branch 'master' of github.com:RobertBeckebans/RBDOOM-3-BFG 2015-07-11 12:16:04 +02:00
Robert Beckebans
02f6328a0d Set USE_INTRINSICS for MSVC 2015-07-11 12:15:59 +02:00
Tobias Frost
bbb41c7781 Do not force USE_INTRINISCS to be set via source-code 2015-07-11 10:33:04 +02:00
Robert Beckebans
223548d148 astyled pull requests 2015-06-24 11:28:31 +02:00
Robert Beckebans
4fa4537978 Use SSE2 intrinsics on x86 2015-06-24 11:27:54 +02:00
Robert Beckebans
9d4c468f08 Merge pull request #228 from coldtobi/master 
rbdoom3: Option to set CPU_ID and to specify CPU Features to be used.
 2015-06-24 11:14:30 +02:00
Robert Beckebans
8a8deb63fd Merge pull request #231 from coldtobi/use_cmake_dl_libs 
Do use CMAKE_DL_LIBS to determine the linkerflags needed to link against libdl
 2015-06-24 11:12:30 +02:00
Robert Beckebans
edc3dfb55a Merge pull request #229 from coldtobi/precompiled-headers-configureable 
Make use of precompiled header configureable
 2015-06-24 11:10:58 +02:00
Pete Lewis
87c08c30cb Use the default audio device in Win8/XAudio2 2015-06-23 11:56:27 -07:00
Tobias Frost
92dab63c30 - Do use CMAKE_DL_LIBS to determine the linkerflags needed to link against libdl. 
- For !WINDOWS, add sys_defines based on compiler instead based on system. (enabled compilation e.g on hurd and kfreebsd)
 2015-06-21 16:52:56 +02:00
Tobias Frost
cf6bb39e11 Make use of precompiled header configureable 2015-06-19 22:15:44 +02:00
Tobias Frost
9212ed4263 Propagate USE_INTRINSICS through CMake 2015-06-19 16:11:16 +02:00
Tobias Frost
332fc8d0e7 Update description of CPU_TYPE -- it does not disable anything anymore 2015-06-19 15:56:24 +02:00
Tobias Frost
90d79158ee Make the CPUSTRING and additional from default optimizations configureable 2015-06-19 15:50:17 +02:00
Robert Beckebans
ee2934781f Merge remote-tracking branch 'RBDOOM/master' 2015-05-01 15:10:23 +02:00
Robert Beckebans
a7c6f4973b Fixed warnings with Clang 3.6 2015-05-01 14:57:31 +02:00
Robert Beckebans
80f0d06a75 Merge remote-tracking branch 'RBDOOM/master' 2015-05-01 14:18:53 +02:00
Robert Beckebans
e9c56ba2df Added polygon primitive support to collision framework 2015-04-12 12:05:38 +02:00
Robert Beckebans
0ac909fe0a Dmap build BSP out of triangles instead of brushes 2015-04-12 11:53:54 +02:00
Robert Beckebans
61f568550e New Blender style mesh .map primitive type 2015-04-12 11:53:05 +02:00
Robert Beckebans
05f06b7131 sRGB gamma correct rendering experiment 2015-04-12 11:11:03 +02:00
Robert Beckebans
96aff1e923 r_useSRGB fixes 2015-03-24 01:11:30 +01:00
Robert Beckebans
395ef525b1 Tweaked shadowmap bias to fight shadow acne 2015-03-19 01:27:44 +01:00
Robert Beckebans
319b659302 Tweaked shadowmap bias to fight Peter Pan effect 2015-03-19 00:31:08 +01:00
Robert Beckebans
720f8e8cdf Merge remote-tracking branch 'RBDOOM-3-BFG/master' 2015-03-15 10:20:56 +01:00
Robert Beckebans
06d0434f32 Improved modding support and loading of custom models/anims 2015-02-25 15:45:16 +01:00
Robert Beckebans
5fb44de8a9 Merge remote-tracking branch 'RBDOOM-3-BFG/master' 2015-02-15 11:17:42 +01:00
Daniel Gibson
90b1ff0b65 Format Code with AStyle 2.05.1 2015-02-09 00:29:57 +01:00
Daniel Gibson
5f5684386e Update astyle to 2.05.1, add astyle Linux binaries 
Unfortunately, different versions of astyle produce slighty different
formatting, so it's important that everyone uses the same version.

Thus it makes sense to provide astyle binaries for Win32 and
Linux x86 and x86_64 (to prevent usage of outdated versions from package
managers etc)

Most probably it would be easy to add an OSX astyle binary as well and
call that from astyle-code.sh if applicable.
I don't have a Mac, though, so someone else will have to do it ;-)
 2015-02-09 00:24:37 +01:00
Robert Beckebans
4c596dcf0d Fixed Gamepad LS and RS in PDA screen. refs #214 2015-02-05 20:11:09 +01:00
Daniel Gibson
015748f823 SDL backend: generate SE_MOUSE_LEAVE events 
The SDL backend now creates SE_MOUSE_LEAVE events when the mouse leaves
the window (both SDL1.2 and SDL2). For some reason, both the SWF GUI
backend and CEGUI are interested in this.
 2015-01-28 17:32:35 +01:00
Daniel Gibson
aa51d38b3c Support up to 16 mouse buttons (SDL-only) 
Mostly necessary because SDL doesn't properly return mouse buttons X1/X2
on Linux/X11, see https://bugzilla.libsdl.org/show_bug.cgi?id=2310

Not sure if this is possible with Windows, DIMOFS_BUTTON7 seems to be
the highest constant there.

Also passing sdlevent.wheel.y directly as scroll delta
 2015-01-28 17:32:35 +01:00