Commit graph

6483 commits

Author SHA1 Message Date
marauder2k7 1e824bfa99 Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-20 22:34:34 +01:00
marauder2k7 8b7e318fd5 multiplatform fixes
-Wrap macosconfig in if(apple)
2023-10-20 22:33:20 +01:00
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
Brian Roberts 0db209e3dc
Merge pull request #1110 from Bloodknight/UpdateSDL
Update SDL to 2.28.4
2023-10-19 11:26:35 -05:00
marauder2k7 b6c9bef48f revert nativeFile
-NativeFileDialog m file was not being set to obj-c, now we force it withe set_source_files_properties.
2023-10-19 16:29:04 +01:00
marauder2k7 8c4650d5dc NativeFileDialogs
-Needed to change nfd_cocoa to an objc++ file with mm extension
2023-10-19 15:47:16 +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
Brian Roberts 2a27addf08
Merge pull request #1112 from Areloch/AssetPropertiesSaveFix
Fixes the handling of the temp editable asset definition in the asset properties inspector so it'll save sub-objects as expected
2023-10-18 17:55:06 -05:00
Areloch 8232d0f6dd Fixes the handling of the temp editable asset definition in the asset properties inspector so it'll save sub-objects as expected 2023-10-18 11:37:27 -05:00
Brian Roberts a16715f673
Merge pull request #1111 from Azaezel/alpha41/cmakeCleanups3
remove bad example template
2023-10-17 19:05:43 -05:00
AzaezelX 76477a6e78 remove bad example template 2023-10-17 11:04:06 -05:00
Bloodknight 6a4f399031 typofix 2023-10-16 17:27:01 +01:00
Bloodknight 618590e1d0 Add config to advanced 2023-10-16 17:23:29 +01:00
Bloodknight 402f7aff99 Update SDL to 2.28.4 2023-10-16 16:51:30 +01:00
AzaezelX 4fb67ed618 refactor by request 2023-10-15 16:09:49 -05:00
AzaezelX 3bdce1f33e lower engine requirements back to c++17 standards, not c++20. 2023-10-15 16:09:49 -05:00
marauder2k7 e6ead9f268 Update console.cpp 2023-10-15 15:14:58 -05:00
marauder2k7 09b1e9783a Mem fix
-Data chunker was leaking, (my bad) fixed

-Added != operator to scene container for std:c++17 conformance.
2023-10-15 15:14:58 -05:00
AzaezelX 4b2e3aac43 typofix 2023-10-14 23:02:55 -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 a5e75dfd61 Make sure TORQUE_TARGET_PROPERTIES is populated before using it 2023-10-08 17:36:51 -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
Lukas Aldershaab bcea9bfc3a Support setting target properties and link options from modules 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 87c6884433 Expose SimObjectPtr C-API functions using EngineAPI 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 8748a2cac8 Expose some information in EngineFunction exports for better interop capabilities 2023-10-08 17:36:51 -05:00
Lukas Aldershaab ee93dc3b57 Ensure that getGlobalScope always returns the same object 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 2c9f6a5350 Remove EngineXMLExport filtering 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 25c1ebcf13 Properly call endGroup instead of addGroup 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 753cbe32d9 Fix SkipMainCs flag, it was inverted 2023-09-28 08:31:39 -05:00
AzaezelX 268603f36c clean up ServerAssetValidator when closing server 2023-09-27 15:45:54 -05:00
Lukas Aldershaab 27b6973da0 Reintroduce getFileLine for Console Modules 2023-09-27 14:58:44 -05:00
Lukas Aldershaab 01cfa4a604 Add sensible defaults for Console Module interface 2023-09-27 14:58:44 -05:00
Lukas Aldershaab 569f3a1e41 Allow skipping main.tscript execution 2023-09-27 14:58:44 -05:00
AzaezelX 0f55389712 rigidshape and derivatives cleanups
dragforce for rigidshapes and children defaulted to a value it's own debuggers won't complain about out of the gate
removed duplicate invalidation for flying vehicle sounds causing network instability
removed redundant hovervehicle vars
2023-09-27 14:37:41 -05:00
Lukas Aldershaab 5615cc33d8 Remove CInterface script hooks, superseded by console refactor 2023-09-27 14:11:13 -05:00
Lukas Aldershaab a4e3a000fb Fix Dynamic Library builds on Windows 2023-09-27 13:53:30 -05:00
Lukas Aldershaab d05d9b6cf1 Fix minor typo 2023-09-27 13:53:30 -05:00
James Urquhart 6605ddc66a Improve ray intersection tests 2023-09-26 12:03:51 -05:00
James Urquhart 568f889dbc Correctly handle currentT processing between bin checks during castRay 2023-09-26 12:03:51 -05:00
James Urquhart dad888f862 Fix compile issue with gcc/clang 2023-09-26 12:03:51 -05:00
James Urquhart 175831fd30 Remove dead code comment 2023-09-26 12:03:51 -05:00