TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-24 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3844 commits 5 branches 33 tags 1,009 MiB
Commit graph

107 commits

Author SHA1 Message Date
AzaezelX
4ed3d11534 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
95b3f2146c 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
7cab44af6f Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into alpha40Macwork 2019-05-23 02:27:22 -05:00
Brian Roberts
e1aecaa07d 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
80ec569c26 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
1259e5245b Proper splitting of D3D and OpenGL sides of the CSF. 2019-05-22 21:44:07 -05:00
Brian Roberts
bda100914d (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
ad5f583893 Various fixes 2019-05-11 21:42:27 -05:00
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
00b958aff9 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
AzaezelX
97ec99f704 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
5a7f0f0b23 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00
Areloch
0f7641a282 WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Azaezel
aebbb1e3d8 tabspace 2019-01-06 15:50:19 -06:00
Azaezel
831e9db5a5 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel
95eb2fc626 zenity backend file filter fix 2019-01-06 14:24:33 -06:00
Azaezel
8304168365 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
989662774e 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
b05d68aacd 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
2be32ad737 Implementation of reflection and skylight probes. 
Moves lighting math to the diffuse/specular two-channel logic.
 2018-09-16 22:15:07 -05:00
Areloch
561f010f2e
Merge pull request #2254 from rextimmy/sdl_2_0_8 
SDL 2.0.8
 2018-05-30 20:37:00 -05:00
Tim
045ddfeb89 cmake fix for apple sdl 2018-05-09 23:09:32 +10:00
rextimmy
2bc1148963 openal-soft updates 2018-05-09 20:48:18 +10:00
Areloch
41aebd237d Makes it so the SDL directory files aren't copied during a template file install. 2018-04-03 23:58:03 -05:00
Areloch
80c7dfcb6c
Merge pull request #2182 from Areloch/AssetBrowser_Initial 
Asset browser initial
 2018-02-01 21:14:50 -06:00
Areloch
8bd533e001 Adds the Systems for the Entity-Component-Systems setup. 2018-01-28 16:58:00 -06:00
chaigler
0002f2d807 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
Areloch
aeaf737999 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
df9deea1a8 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch
eec61ce1b9 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Azaezel
b3c945b971 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05:00
Areloch
23fb9ba38b Conflict resolution with devhead. 
Cleaned up a few remaining d3d9 references in the cmake file.
 2017-06-01 23:54:44 -05:00
Areloch
885bbf52e4 Corrects an issue where a change to the target template may not generate the appropriate main.cs for that template after the initial build configure. 2017-02-27 17:10:08 -06:00
Areloch
8b4b467bff Merge pull request #1932 from Areloch/cmake_cleanse 
Cleans up a few cmake options and flags
 2017-01-31 09:47:08 -06:00
Areloch
08432978bf Merge pull request #1922 from elfprince13/perProjectCmakes 
Optionally include a CMake configurations file from the project directory
 2017-01-25 21:06:05 -06:00
Areloch
f43bfd6ca2 Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason 2017-01-17 01:10:24 -06:00
Thomas "elfprince13" Dickerson
de53ac86c7 Somebody broke SDL when they updated it. The new version depends on AudioToolbox, so added that as dependency in torque3d.cmake 2017-01-13 10:44:05 -05:00
Thomas "elfprince13" Dickerson
f05a552c61 Optionally include a CMake configurations file from the project directory to support configuration changes that don't have to alter the whole engine repo 2017-01-11 18:03:21 -05:00
Areloch
d3dd5ce235 Merge pull request #1858 from Azaezel/options_ON 
flips dx11, opengl, and sdl2 on by default now that those are no long…
 2016-12-20 23:36:29 -06:00
Areloch
a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr 
Preliminary IPV6 Support
 2016-12-04 16:22:42 -06:00
Jeff Hutchinson
0296e6d3fd Fix merge conflict and add check for unix and not apple for glx 
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
 2016-11-02 21:55:24 -04:00
James Urquhart
704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
RexTimmy
3a0a720115 OpenAL-soft for windows 2016-10-22 09:22:33 +10:00
Azaezel
09cbb0df1a -Wno-unused-local-typedef surpresses unused typedef spam (in fastDelegate in particular) 2016-10-19 18:50:13 -05:00
Azaezel
132aed4c71 -Wno-return-type-c-linkage surpreses "extern C warning" spam reguarding nonstandard classes used in conjunction with the script trampoline macros. 2016-10-19 08:01:48 -05:00
Azaezel
16167b3250 filters false flags from clang compilation 2016-10-18 08:39:39 -05:00
RexTimmy
dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
Jeff Hutchinson
fd4628a08a glad cmake 2016-09-11 21:48:36 -04:00
Azaezel
714bf1afba flips dx11, opengl, and sdl2 on by default now that those are no longer experimental. also seperates out the dedicated flag for compilation on windows 2016-08-25 16:53:09 -05:00
rextimmy
7c011cdd27 CMake support for VS_STARTUP_PROJECT 2016-07-16 12:14:31 +10:00