Jeff Raab
38b0d0f1fe
Updates names of probe forward shader consts to be consistent with shadergen, allowing proper data throughput
2019-07-16 09:34:31 -05:00
AzaezelX
bc77ff0833
Revert "Updated SDL, Bullet and OpenAL soft libs"
...
This reverts commit 370161cfb1 .
2019-07-08 09:49:44 -05:00
Areloch
f8750dd8ed
Updated SDL, Bullet and OpenAL soft libs
...
Fixed case sensitivity problem
Fixed clang compiler problem with having the class namespace used in an inline for the == operator
Tweaked some theme stuff to be more consistent.
Added initial test of no-pie for linux
test sidestep of getTexCoord in shadergen hlsl feature so we don't assert when getting the terrain's shaderstuffs(which uses float3 instead of normal float2)
2019-07-07 02:43:49 -05:00
Areloch
d9f80140f1
Include materialball shape asset info
...
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
2019-05-25 03:37:18 -05:00
AzaezelX
4ee8df8863
windows and linux AL_ALEXT_PROTOTYPES blocks, as well as exposed the defining of it cmake side for the adventurous (windows and linux on by default, mac off till we sort why dylibs are freaking out)
2019-05-24 14:12:04 -05:00
Brian Roberts
518cd593b2
revert to using the stock mac framework, and encapsulate nonstandard openal extensions usage under a set of #if defined(AL_ALEXT_PROTOTYPES) blocks
2019-05-24 11:11:09 -05:00
Brian Roberts
c0c8ecf521
Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into alpha40Macwork
2019-05-23 02:27:22 -05:00
Brian Roberts
5ca2a5eb51
shift openal-soft directory add plus various cmake set(values) on over to an o/s agnostic block, rather than only including that if used on windows
2019-05-23 02:27:02 -05:00
AzaezelX
afa52850c3
Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork
...
# Conflicts:
# Engine/source/materials/materialDefinition.cpp
# Engine/source/materials/processedFFMaterial.h
# Engine/source/materials/processedShaderMaterial.cpp
# Engine/source/renderInstance/renderBinManager.cpp
# Engine/source/renderInstance/renderGlowMgr.cpp
# Engine/source/renderInstance/renderMeshMgr.cpp
# Engine/source/renderInstance/renderPassManager.h
# Engine/source/renderInstance/renderTranslucentMgr.cpp
# Engine/source/shaderGen/customShaderFeature.cpp
# Engine/source/shaderGen/customShaderFeature.h
2019-05-22 23:36:15 -05:00
Areloch
f9371bfc2e
Proper splitting of D3D and OpenGL sides of the CSF.
2019-05-22 21:44:07 -05:00
Brian Roberts
a5f2848b0d
(partial) mac compilation correction -
...
1) correct cmake to look to the included openal-soft, not the system framework.
2) (incorrect) stubb-ins for library to function table binds
2019-05-21 21:31:30 -05:00
Areloch
3fa7a0d4fa
Various fixes
2019-05-11 21:42:27 -05:00
Areloch
e83ec69292
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development
2019-05-06 01:50:45 -05:00
Areloch
82c74b4511
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 01:49:58 -05:00
AzaezelX
dd1470202d
Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
...
# Conflicts:
# Engine/source/gfx/D3D11/gfxD3D11Device.cpp
# Engine/source/lighting/lightManager.cpp
# Templates/Full/game/levels/Empty Room.mis
# Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
Areloch
87ee749801
(Mostly) updated verve implementation.
2019-03-07 16:23:41 -06:00
Areloch
161bf7f83b
Updated assimp to latest
2019-03-05 14:39:38 -06:00
Areloch
25ce4477ce
Just the functional assimp lib rather than the entire assimp repository unnecessarily.
2019-02-28 16:37:15 -06:00
Areloch
bf170ffbca
WIP of assimp integration.
2019-02-08 16:25:43 -06:00
Azaezel
9a7ae06721
tabspace
2019-01-06 15:50:19 -06:00
Azaezel
7900783163
constant consistency creates continuums
2019-01-06 15:42:18 -06:00
Azaezel
6ee436382f
zenity backend file filter fix
2019-01-06 14:24:33 -06:00
Azaezel
14836daa89
linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one.
2019-01-01 15:40:44 -06:00
Azaezel
300abf0ecd
blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux
2019-01-01 11:00:05 -06:00
Azaezel
1eed979a9c
Merge branch 'method_Unmangle' into PBR_PR
2018-12-12 14:54:22 -06:00
Areloch
900816fcd0
Merge pull request #2186 from rextimmy/physx_3_4
...
Physx 3.4
2018-12-09 15:28:43 -06:00
Azaezel
96101a0e56
correction for folks supporting older codebases outside of this engine: don't try and include the older directx library unless youre also deliberately using the older directsound end of things, and for dx11, reference the #include <d3d11_1.h> lib instead of the <d3d11.h> one to pair with the reference used by SDL2
2018-11-23 00:30:23 -06:00
Areloch
b19a4b22c8
Implementation of reflection and skylight probes.
...
Moves lighting math to the diffuse/specular two-channel logic.
2018-09-16 22:15:07 -05:00
rextimmy
a95f678602
physx support for vs 2017 round 2
2018-06-23 12:20:07 +10:00
Areloch
ee9f3b74ec
Merge pull request #2254 from rextimmy/sdl_2_0_8
...
SDL 2.0.8
2018-05-30 20:37:00 -05:00
Tim
ad5d781cef
cmake fix for apple sdl
2018-05-09 23:09:32 +10:00
rextimmy
925d8b27cf
openal-soft updates
2018-05-09 20:48:18 +10:00
Glenn Smith
cecf109f93
Higher resolution torque icon, 1024x1024 for macOS, 256x256 for Windows.
2018-04-14 17:51:29 -04:00
Areloch
570c6844f9
Makes it so the SDL directory files aren't copied during a template file install.
2018-04-03 23:58:03 -05:00
Tim
c0b50792f7
physx support for vs 2017
2018-03-18 16:11:07 +10:00
Bloodknight
20eefee3cd
Merge branch 'development' into issue_2115
2018-02-05 15:59:33 +00:00
Tim
c0f298e37d
Fixed physx3 linux cmake build
2018-02-03 13:40:33 +10:00
Areloch
963739102c
Merge pull request #2182 from Areloch/AssetBrowser_Initial
...
Asset browser initial
2018-02-01 21:14:50 -06:00
Areloch
57284507f2
Adds the Systems for the Entity-Component-Systems setup.
2018-01-28 16:58:00 -06:00
chaigler
b52cda0c66
Remove legacy_stdio_definitions.lib
...
Dependency was added by PR #1566 . No longer needed now that DX SDK has
been replaced.
2018-01-24 08:17:40 -05:00
Marc Chapman
cd6947c7e0
Phase 3: Adjust cmake files to add #define to torque config
2018-01-23 22:48:20 +00:00
rextimmy
f2dc291cf5
PhysX 3.4 implementation
2018-01-19 22:34:26 +10:00
Areloch
601d232223
Removes the LibMNG and LunGIF libraries, as they aren't actually utilized and just extend the build times.
2018-01-02 15:48:44 -06:00
Areloch
0c21ef1b45
Removes Entity/Component stuff from being behind an experimental flag.
2017-10-15 06:03:59 -05:00
Areloch
6479c7592a
Merge pull request #2088 from Areloch/EditorTool
...
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch
e023cf3a60
Merge pull request #2056 from Bloodknight/afx_merge_main
...
Afx merge main
2017-10-11 08:47:47 -05:00
Areloch
bc898e1150
Initial implementation of the EditorTool class and world editor hook-in.
2017-09-21 00:10:44 -05:00
rextimmy
bdfe44cc93
Disable sqlite support by default
2017-09-10 09:56:09 +10:00
rextimmy
79118ee00f
sqlite fixes
2017-08-31 21:07:23 +10:00
Areloch
ad612e218b
Merge pull request #2060 from Bloodknight/add_sqlite
...
SQLite Integration
2017-08-24 21:58:54 -05:00