TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8196 commits 5 branches 33 tags 958 MiB
Commit graph

334 commits

Author SHA1 Message Date
marauder2k7 9bc06f0887 main dir 
SDL_BaseDir was returning the directory that contains the app, now it returns the resources directory
 2023-10-20 22:23:38 +01:00
marauder2k7 f10520e751 Macosx build with rpath 
Archiving builds no longer have linking errors when run
 2023-10-20 21:06:53 +01:00
marauder2k7 b6617b1b0f Working multi-arch archiving 
-Working multi arch compile
-Required assets now copy to the app bundle
TODO: Make the logic to wrap around whether its multi arch
-The changes in torqumacosconfigs.cmake are not required if we are only building one architecture, also if it is x86_64 we can drop min deployment target to 10.13
 2023-10-20 12:04:56 +01:00
marauder2k7 e381bf4838 Working archive 
-Archive now working if we override the shared libs rpath with the correct installation path
 2023-10-20 00:19:40 +01:00
marauder2k7 0af0b5a24a MACOS working 
Mac working in this stage
 2023-10-19 14:39:22 +01:00
marauder2k7 a200554496 more changes 
-Apple = more trouble than its worth
 2023-10-19 11:45:25 +01:00
marauder2k7 c11587cad3 Attempt 2 
-Missing includes may be due to no parent_scope
 2023-10-19 11:04:16 +01:00
marauder2k7 ac60ce8da7 Update apple.toolchain.cmake 2023-10-19 09:58:55 +01:00
marauder2k7 1b49f28d19 move all setup to toolchain 
-All apple config in toolchain
 2023-10-19 08:57:24 +01:00
marauder2k7 e6c387c67a Update apple.toolchain.cmake 2023-10-19 08:29:27 +01:00
marauder2k7 13af296bf8 initial toolchain 
-test of an initial toolchain setup for macosx builds
 2023-10-19 08:08:50 +01:00
AzaezelX 76477a6e78 remove bad example template 2023-10-17 11:04:06 -05:00
AzaezelX b278802645 cmake cleanups 
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
 2023-10-14 23:02:55 -05:00
Lukas Aldershaab df8041e689 Add support for replacing the main.tscript file with a specified Console Function 2023-10-08 17:36:51 -05:00
AzaezelX 62f4d443d5 more tools pseudo-module incorporation cleanup 2023-09-17 18:29:10 -05:00
AzaezelX a36a35c39e clean up folder display of optional core modules 2023-09-17 17:15:43 -05:00
AzaezelX 6a6eb0bbc7 extension point for os-specific configs, with mac example 2023-08-16 09:17:43 -05:00
Areloch cac793f437 Fixes up the libCurl module cmake config so it works as expected again 2023-08-03 16:18:57 -05:00
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
rextimmy d58cf398a9 make use of folder properties in cmake 2021-11-22 12:30:08 +10:00
Robert MacGregor 247b12e795 * BugFix: Correct many include paths and build platformX11 on non-Apple Unix. 2021-11-14 14:45:42 -05:00
Jeff Hutchinson 3fdd7266e3 Better Architecture detection strategy if compiling on Apple Silicon 2021-11-06 22:56:05 -04:00
Robert MacGregor 6f617cace8 * BugFix: Correct compiler warnings induced by adding -msse to the compiler commandline on non-x86 devices. 2021-11-01 09:01:00 -04:00
Robert MacGregor 6b56210a47 * Feature: Properly detect ARM32/ARM64 in the CMake build process and enable ARM NEON when either of these are detected. 2021-10-27 17:30:43 -04:00
Jeff Hutchinson 98657bde7a
Merge pull request #621 from Ragora/bugfix-lpng-warnings 
update lpng
 2021-10-13 18:29:06 -04:00
Robert MacGregor 9d9db307c7 * [Build] BugFix: Correct CMake errors on Windows. 2021-10-13 17:10:47 -04:00
Brian Roberts ba9debf89f
Merge pull request #617 from Ragora/adjustment-unix-case-insensitivity 
Adjustment: POSIX Case Insensitivty
 2021-10-13 13:12:29 -05:00
Robert MacGregor c0ff69a2e6 * [CMake] BugFix: Remove a forgotten debug message. 2021-10-12 18:44:32 -04:00
Robert MacGregor c965429cf6 * [lpng] BugFix: Corrections to allow the SSE intrinsics to build properly. 2021-10-12 17:38:27 -04:00
Robert MacGregor 7a78ec46c8 * [lpng] BugFix: Correct some compiler warnings associated with lpng and SSE optimizations. This also enables SSE when available for lpng. 2021-10-12 17:20:23 -04:00
Robert MacGregor ca5e706ab4 * [CMake] BugFix: Clear several CMake warnings. 2021-10-12 13:19:28 -04:00
Robert MacGregor 66cfd34b71 * [CMake] BugFix: Correctly set the description and default values of TORQUE_POSIX_PATH_CASE_INSENSITIVE and TORQUE_ZIP_PATH_CASE_INSENSITIVE. 2021-10-12 13:09:12 -04:00
Robert MacGregor 8d0128698a * [ZIPVolume] BugFix: Add the capability of resolving ZIP prefix paths with case insensitivity and a CMake option to control this behavior. 2021-10-11 19:02:58 -04:00
Robert MacGregor 497a94f884 * Adjustment: Cleanups to the case insensitivity code for POSIX systems and add case insensitivty to directory dumping code. 2021-10-11 10:24:24 -04:00
Jeff Hutchinson 41bd5ef6b6 remove FMODex from Torque3D 
The current version of FMod in Torque3D uses the legacy ex plugin, which hasn't been around for a long time.
 2021-09-11 16:29:32 -04:00
AzaezelX 3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Brian Roberts 4e05c780a4
Merge pull request #506 from Azaezel/alpha40/stupidTypoTricks 
adress #504 - typo leading to broken $origin reference
 2021-07-28 13:31:27 -05:00
AzaezelX 3db777b0a0 adress #504 - typo leading to broken $origin reference 2021-07-19 09:41:31 -05:00
Areloch 5525f8ecdd Converts all game, gui editor, and system classes to utilize assets 
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
 2021-07-19 01:07:08 -05:00
Areloch 83b0432283
Merge pull request #489 from Azaezel/alpha40/zipPassPunt 
expose a zip file password cmake config option
 2021-07-17 11:03:26 -05:00
Areloch 4d40e3cab5
Merge pull request #449 from OTHGMars/Zip_Test2 
Loading from zipped game directories.
 2021-07-17 11:03:19 -05:00
OTHGMars 86c302c42e Prevents overwriting existing .torsion files. 2021-06-22 06:11:01 -04:00
OTHGMars 11c258fcdb Script extension assignment. 
Sets extension on installed script files.
Enables .torsion file to be reconfigured after extension change.
Prevents copy of main.tscript.in.
 2021-06-22 00:48:53 -04:00
AzaezelX a34aea55f7 expose a zip file password cmake config option 2021-06-02 16:08:51 -05:00
Brian Roberts 89e76f96de
Merge pull request #477 from Areloch/torsiontscriptcompliance 
Updates the torsion.in file to properly be configured to handle tscript extension
 2021-05-13 23:03:09 -05:00
Areloch 438788c9b3 Rolled in Az's suggested fixes 2021-05-13 19:30:53 -05:00
Jeff Hutchinson 61fef8080b mend 2021-05-10 19:58:51 -04:00
Jeff Hutchinson ef34210fef Implement Unit Test Suite for TorqueScript. 2021-04-12 21:43:57 -04:00
Areloch 9a0de40505 Updates the torsion.in file to properly be configured to handle tscript extension 2021-03-13 23:47:18 -06:00
AzaezelX 3603188b7f update openal-soft 
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
 2021-01-26 13:01:35 -06:00
Lukas Aldershaab 9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00