Commit graph

242 commits

Author SHA1 Message Date
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
Azaezel 5b7e973ad5 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05:00
Marc Chapman b35aa017cc Add SQLite files + cmake file 2017-07-30 16:26:46 +01:00
Marc Chapman 1a17496c28 Cmake file to build AFX 2017-07-27 01:51:54 +01:00
Areloch adb875cb54 Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch 1788bee4f6 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 1ed8b05169 Initial implementation of the new Base Game Template and some starting modules.
This makes some tweaks to the engine to support this, specifically, it tweaks the hardcoded shaderpaths to defer to a pref variable, so none of the shader paths are hardcoded.

Also tweaks how post effects read in texture files, removing a bizzare filepath interpretation choice, where if the file path didn't start with "/" it forcefully appended the script's file path. This made it impossible to have images not in the same dir as the script file defining the post effect.

This was changed and the existing template's post effects tweaked for now to just add "./" to those few paths impacted, as well as the perf vars to support the non-hardcoded shader paths in the engine.
2017-02-24 02:40:56 -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
rextimmy 18c906ca09 Physx cmake module correction 2017-01-04 17:20:43 +10:00
rextimmy b23b8d118e Physx 3.3 cmake support 2017-01-04 01:47:01 +10:00
rextimmy 540c9b72c0 Bullet 2.85 update 2016-12-28 18:32:21 +10: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
RexTimmy 79dca17d5e Change VS to use the default fp:precise 2016-12-08 09:14:20 +10:00
Areloch a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Areloch e759ab8612 Merge pull request #1812 from Azaezel/testTrouble
clang: The unit test suite doesn't play nice with -wundef
2016-11-26 02:01:47 -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 a46b4fb5e8 clang: The unit test suite doesn't play nice with -wundef
(test for #if +uninitialized #defines)
leaving that as an option, but off by default to allow filtering through engine specific #defines for issues, rather than wading through the spam kicked up by the plugin.
2016-10-18 11:20:28 -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
rextimmy 2ec38f98cc Update libogg to 1.3.2 2016-09-16 11:42:00 +10:00
Jeff Hutchinson 8fc96e8744 add glad license and remove epoxy cmake 2016-09-11 21:48:55 -04:00
Jeff Hutchinson fd4628a08a glad cmake 2016-09-11 21:48:36 -04:00
James Urquhart e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +01:00
James Urquhart e7bafe3c7b Fix cmake file for openvr 2016-09-11 22:42:42 +01:00
James Urquhart 126828131d Improve openvr, also add a module for it. 2016-09-11 22:42:42 +01: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
Anis 61418b1772 Merge pull request #1683 from John3/wrongPathMiniCLTask
Fix wrong folder path for cmake libbullet. Folder MiniCLTask and scalar
2016-08-07 02:29:41 +02:00
rextimmy 7c011cdd27 CMake support for VS_STARTUP_PROJECT 2016-07-16 12:14:31 +10:00
John3 4c7e8aac82 Fix wrong folder path for cmake libbullet. Folder MiniCLTask and scalar 2016-07-10 21:15:35 -05:00
Areloch 3a73344abb Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off. 2016-06-05 19:17:34 -05:00
Areloch 510b726f6f Final Linux compliance changes(renames, tweaks for gcc compliance, etc) 2016-05-29 00:58:02 -05:00
Areloch ec8882c3c8 Ensuring all names are the correct casing for Linux 2016-05-26 01:37:14 -05:00
Areloch f54fde9c6b Missing the preprocessor define in the project generation. 2016-05-19 23:42:38 -05:00
Areloch 03e6228e56 Adjusts the CMAKE install script to not install the E/C-related template files if that's not set as a flag. 2016-05-17 23:58:34 -05:00
Areloch b04ad52b5d Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check. 2016-05-15 10:11:46 -05:00
Areloch a63a636d03 Fixes the blacklist filter in the event we aren't using SDL to avoid including an unwanted file dialog codefile. 2016-05-05 22:59:17 -05:00
Areloch e8bc70e514 Merge pull request #1567 from JeffProgrammer/epoxy
Added Epoxy in favor of GLEW
2016-05-05 19:40:59 -05:00
rextimmy f1c8286c2f Fix for Epoxy to work with SDL and VS 2015 2016-05-04 10:05:34 +10:00
Areloch ec6f9c05a6 Integrates the nativeFileDialog library to enable native file dialogs on the major platforms. It is activated with SDL. 2016-04-30 15:48:33 -05:00
Jeff Hutchinson fddc00b39b Merge branch 'development-gg' into epoxy 2016-04-17 23:59:42 -04:00
Areloch 131090f1b7 Made the cmake SDL flag a regular, non-advanced option so that it's not hidden from the base setup on Windows. 2016-04-06 21:21:55 -05:00
Areloch 6a40b8bb84 Merge pull request #1559 from rextimmy/dx11_clean
Direct3D11 Support
2016-03-29 00:51:23 -05:00
Jeff Hutchinson b89d2a116e cmake for epoxy and rip glew 2016-03-25 13:38:40 -04:00
Jeff Hutchinson e9efc05ebb fix release build compile with MSVC 2015 (finally) 2016-03-24 14:22:45 -04:00
rextimmy bd60f3be1a Direct3D11 CMake and Project Generator files. 2016-03-20 21:55:40 +10:00
Areloch 00ca1e8692 Merge pull request #1464 from Azaezel/bulletModule
bullet module
2015-11-14 15:40:59 -06:00
Azaezel b48802c6c4 bullet module
verified extract from https://github.com/GarageGames/Torque3D/pull/1146
2015-11-14 11:28:21 -06:00
Areloch 1f72245772 Some cleanup and adding in the necessary changes to cmake. 2015-10-13 15:50:30 -05:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
wcb 845ec9c452 CMake NMake fix to place exe in game directory 2015-09-23 19:46:36 -04:00
Areloch 31afbedfb6 Merge pull request #1346 from eightyeight/fix-threadpool-tests 2015-08-21 00:07:55 -05:00
Azaezel 6d121299ec -wall leads to incredibly long compile times (we're talking 5 minutes vs 80, here) 2015-08-03 17:09:53 -05:00
Daniel Buckmaster d68c9036bf Include thread tests in CMake. 2015-07-05 14:11:58 +10:00
Daniel Buckmaster 39f0e269d6 Merge pull request #1328 from GarageGames/release-3.7
Release 3.7
2015-06-24 19:00:57 +10:00
James Urquhart 3a457749ec Oculus VR DK2 Support
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
2015-05-06 23:09:51 +01:00
Daniel Buckmaster 4a705c875c Move the Vagrant config into a distro-specific folder. 2015-04-19 16:18:03 +10:00
Luis Anton Rebollo 8f94614a6e Merge pull request #1169 from eightyeight/add-vagrant
Add Vagrant config
2015-03-15 01:26:18 +01:00
Luis Anton Rebollo c73355bcd6 Merge pull request #1049 from cornytrace/VS2012-Support
Add VS2012 support to projectgenerator
2015-03-14 22:43:37 +01:00
LuisAntonRebollo 30bf15f4ee Fix Linux rpath. Changed to use $ORIGIN. 2015-03-08 20:40:35 +01:00
LuisAntonRebollo 265d1a540a Fix Linux rpath. 2015-03-07 22:41:00 +01:00
Adam Beer 86b8b39978 Update vc2k8_lib_proj.tpl 2015-02-15 13:29:59 -05:00
Adam Beer 8d66817e36 Update vc2010_lib_proj.tpl 2015-02-15 13:28:12 -05:00
Daniel Buckmaster f821898857 Also turn unit tests on 2015-02-08 17:57:27 +11:00
Daniel Buckmaster 2416297b12 Separate GUI config. 2015-02-07 17:03:04 +11:00
Daniel Buckmaster 7252c69738 Readme will be replaced by wiki tutorial. 2015-02-07 14:27:10 +11:00
Daniel Buckmaster 4ea5ac8659 Default navigation module on in CMake 2015-02-07 14:07:30 +11:00
Daniel Buckmaster 7d3a76ab13 Start to work on Vagrant readme. 2015-02-07 13:20:45 +11:00
Daniel Buckmaster 2c0b941b31 Formatting. 2015-02-07 13:20:23 +11:00
Daniel Buckmaster 877aadd68e 64-bit is more common and works fine. 2015-02-07 13:20:10 +11:00
Daniel Buckmaster f01596554a Discovered a new dependency. 2015-02-02 17:07:12 +11:00
Daniel Buckmaster d6ce1c3601 Does not exist. 2015-02-02 17:07:06 +11:00
Daniel Buckmaster abea882862 No GUI mode for now. 2015-02-02 17:06:48 +11:00
Daniel Buckmaster 05fba1f110 Reorganised. 2015-02-01 22:01:12 +11:00
Daniel Buckmaster db06ffec7d Started to work on Vagrant configuration. 2015-02-01 21:22:05 +11:00
LuisAntonRebollo 1dacf7b04e Fix torqueConfig.h TORQUE_FRAME_SIZE. 2015-01-31 19:34:14 +01:00
LuisAntonRebollo 744e7d4745 Merge remote-tracking branch 'GG-Github/development' into dynamic-CMake-modules
Conflicts:
	Tools/CMake/torque3d.cmake
2015-01-30 18:24:38 +01:00
LuisAntonRebollo 5583e73ca5 Fix for CI server on gcc Linux. 2015-01-24 23:28:12 +01:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
Luis Anton Rebollo f4b3d1e4cb Merge pull request #1064 from bpay/cmake-fixes
CMake fixes
2014-12-27 03:18:26 +01:00
LuisAntonRebollo 29e610fbad OpenGL: Add project define for GLEW with php generator. 2014-12-27 00:39:47 +01:00