Commit graph

336 commits

Author SHA1 Message Date
marauder2k7 d6a4c63c27 Update torque_configs.cmake 2023-07-24 12:59:27 +01:00
marauder2k7 c09f79d199 separate testing environment
-Separate main for running unit tests
-Move unit tests into testing folder
2023-07-24 12:38:36 +01:00
AzaezelX 3f96225bca kill bad project assignment 2023-07-06 14:38:20 -05:00
AzaezelX cc037f7306 work around GLOB_RECURSE not... recursing... directories 2023-06-19 14:27:05 -05:00
AzaezelX 6d91cabaff unit test module cleanup 2023-06-15 20:19:39 -05:00
AzaezelX 79dffb1877 get gtest partly hooked back up. todo: engine/source directories only included when TORQUE_TESTING is on 2023-06-15 19:54:38 -05:00
AzaezelX c1daeffe06 kill redundant files 2023-06-14 21:43:56 -05:00
AzaezelX fa14b8c3a9 framework macro typofix 2023-06-12 09:01:50 -05:00
AzaezelX d4c73c8733 gtest cmake config convert 2023-06-10 19:26:18 -05:00
AzaezelX db3e7984ad fix mac compile 2023-06-04 12:45:55 -05:00
AzaezelX 1194f7f49d shift non-torque config flags over to lib/cmakelists.txt 2023-06-04 09:41:48 -05:00
AzaezelX 653580b469 get ogg working 2023-06-03 20:29:35 -05:00
AzaezelX 8906c12ddd kill dupe macro definitions, add macro(addFramework framework) for mac support to append frameworks, and further mark-as-advanced cleanups 2023-06-03 13:47:36 -05:00
AzaezelX e55d71f6ee macro and config refactor proposal 1 2023-06-03 10:42:04 -05:00
AzaezelX c61439c2f9 Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments
# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake
2023-05-27 18:18:17 -05:00
Lukas Aldershaab 1d28ddf734 Cleanup and improve 2023-04-06 15:28:09 +02:00
Jeff Hutchinson d4a6ea4628 Fix LibPNG on Universal MacOS + Bump minimum MacOS version to 10.14 2022-12-17 22:45:09 -05:00
Jeff Hutchinson 1940becb2d Compilation fixes for C++20 2022-11-28 21:39:06 -05:00
Bloodknight 6fed06b1e7 Update Assimp default importers 2022-10-02 20:14:53 +01:00
Brian Roberts 391b656e2c
Merge pull request #894 from Areloch/SMAA_and_Misc20220916
Implements SMAA and a few unaffiliated fixes
2022-09-16 23:11:39 -05:00
Jeff Hutchinson 0e1a5d6279 Update cmake mark_advanced for sdl and libpng 2022-09-16 19:23:16 -04:00
Areloch 5e9d7d63a1 Adjusts handling for httpObject class so that if curl flag is off, files are not included and references are disabled to avoid compilation issues
Adds SMAA anti aliasing
Adjusts AA option setting to properly work and facilitate SMAA
Added defaults for AA to facilitate SMAA
Updated brightness and HDR values on Example Level to comply more closely to the Editor default to give better default results
Fixed issue where ShapeEditor wasn't initialized properly when we'd open it from the Asset Browser
2022-09-16 16:16:12 -05:00
Glenn Smith 81f17f132b
Static link libcurl 2022-09-03 02:38:00 -04:00
Glenn Smith 1210acbee1
Windows curl options 2022-09-03 01:41:06 -04:00
Glenn Smith 01a719ee58
Update libcurl 2022-09-03 01:31:41 -04:00
Glenn Smith 20eb0a911a
HTTPObject with CURL 2022-09-03 00:54:26 -04:00
Areloch 04e108729e Adjusts logic for definingi TORQUE_DEBUG and TORQUE_RELEASE to be consistent across platforms 2022-08-04 14:01:54 -05:00
Robert MacGregor 5f50e7b70a * BugFix: Add bullet include directories to Torque when building. 2022-06-22 10:15:56 -04:00
Robert MacGregor 161ffc62fe Merge branch 'Preview4_0' into feature-vfs-security 2022-06-13 08:05:26 -04:00
JeffR c7763fe3ec Added cleanup of exec stack for module when it's finished to avoid duplicate executions
Added proper container bracketing for the main menu buttons and made that the main navigation target
Added logic to UINav to prevent needlessly re-setting the root page if it already is the root page, which would break the navigation stack
Added logic to UINav toprevent needlessly adding duplicate pages whicn would break the navigation stack
Added logic to close the chooseLevelDlg page when the level is loaded to avoid the page being left hanging on the nav stack
Fixed assetId for no preview image fallback on the chooseLevelDlg page
Fixed display of icons in the shape editor shape helper section
Fixed name lookup on terrain material editor dialogue which would break saving of terrain materials
Disables TORQUE_SFX_DirectX which is currently not in use and nonfunctional
2022-06-02 20:17:23 -05:00
Robert MacGregor 3d963d44e3 * BugFix: Allow header files to appear in the filters through use of a helper function torqueAddSourceDirectories. 2022-06-01 13:18:34 -04:00
Robert MacGregor 688f201011 * BugFix: Correct applications built on Windows or OSX not having icons. 2022-05-31 07:27:54 -04:00
Robert MacGregor f395c7d9ee * BugFix: Correct a few typos in the CMakeLists.txt.
* Feature: Mirror support for TORQUE_SFX_DirectX which appears to be
  broken anyway.
2022-05-31 07:08:18 -04:00
Robert MacGregor 2ee56751dd * BugFix: Corrections to allow the Windows build to work correctly with D3D11.
* BugFix: Corrections to allow executables and libraries to build in the game directory without an install.
2022-05-30 14:22:59 -04:00
Robert MacGregor 74faab3fb4 * Feature: Implement scanning for sub projects. 2022-05-21 20:01:23 -04:00
Robert MacGregor b23554295c * BugFix: Correct some errors in the module scripts.
* BugFix: Fixes for compiling on Windows.
2022-05-21 18:07:14 -04:00
Robert MacGregor dfc03da9d9 * Feature: Begin working the new engine module system. 2022-05-17 20:42:35 -04:00
Robert MacGregor 9901fa76b4 * Feature: Initial testing with module (file) searches. 2022-05-17 18:04:19 -04:00
Brian Roberts fea5f325ea
Merge pull request #777 from Azaezel/alpha40/assimp523
update assimp to 5.2.3 Bugfix-Release
2022-05-06 17:10:51 -05:00
AzaezelX 82e608f990 add workaround logic for configuration file generation 2022-04-26 16:03:00 -05:00
AzaezelX bd1bbdc258 correct mac compilation
SDL now leverages https://cmake.org/cmake/help/v3.10/command/enable_language.html
2022-04-25 13:28:32 -05:00
Robert MacGregor 277cdf67b0 * Feature: Initial secure VFS implementation with asset import capability. 2021-12-17 21:16:42 -05:00
Robert MacGregor bd979aa5cf * Adjustment: Minor formatting fix in basics.cmake. 2021-12-14 22:23:23 -05:00
Robert MacGregor d1dbfad0c7 * [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided. 2021-12-14 22:06:47 -05:00
Robert MacGregor 58f6431ff0 * BugFix: Correct compilation for MacOS by explicitly specifying C++11 for all libraries and C++17 for the engine itself. 2021-12-03 16:37:22 -05:00
rextimmy a0a3608c34 * Torque now requires c++17 due to new torque script code
* Minimum version of cmake is now beyond 3.6.0, no need to check for that when selecting VS_STARTUP_PROJECT
2021-12-02 20:40:15 +10:00
AzaezelX 490b8271e8 fix erroneous clipout 2021-11-25 19:51:34 -06:00
AzaezelX 583014de60 fix erroneous clipout 2021-11-25 19:49:56 -06:00
AzaezelX 1816b3ca0c modular source work
from @marauder2k7:
augments the modular inclusion of sourcefiles via confining it to /source/ directories only to prevent strays.
additionally, adds a /lib/ filter for full on library inclusion
2021-11-25 19:39:44 -06:00
Robert MacGregor ba7082bea1 * BugFix: Correct the inability to build on MacOS due to differing target names on MacOS. 2021-11-23 10:32:49 -05:00