TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-25 17:43:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3853 commits 5 branches 33 tags 960 MiB
Commit graph

76 commits

Author SHA1 Message Date
Areloch
ae857faae2 Adds test shapes of Kork and SpaceOrc 
Sidestep of memleak from CSF at the moment
Minor fixes and corrections with asset importing and loose files
WIP of updated options menu
 2019-05-28 17:24:29 -05:00
Areloch
d9f80140f1 Include materialball shape asset info 
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
 2019-05-25 03:37:18 -05:00
Areloch
ef226f6a65 Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0 2019-05-25 01:08:16 -05:00
Areloch
7bedf48046 Added missed lines to init the reflection probe baking gui 2019-05-21 01:25:24 -05:00
Areloch
805557ea1c Fixed up behavior of the new functions of convex editor. 2019-05-21 00:29:44 -05:00
OTHGMars
9a1766479d Import Options gui Update 
Updated import options gui with tree view, additional shape statistics and settings load/save options. See /Engine/lib/assimp/t3d_usage.md for usage tips.
 2019-05-21 01:19:35 -04:00
Areloch
ebb51bb178 Catch the template files up and add the improved convex editor bits. 2019-05-19 21:30:45 -05:00
Areloch
3697737498 Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch
3fa7a0d4fa Various fixes 2019-05-11 21:42:27 -05:00
Areloch
60a29777fa WIP updated UI 
WIP dark editor theme
fixed multiwindow
 2019-05-09 00:11:49 -05:00
Areloch
cedbd387d9 Updating BaseGame to work with PBR, and a PBR example module 2019-05-08 01:27:51 -05:00
Areloch
82c74b4511 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
Areloch
951594259f Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
7f37aced90 Merge branch 'ExpandsComponents' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:09:09 -05:00
Areloch
ace58e2c28 Merge branch 'ExpandedAssetsPR' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:08:11 -05:00
Areloch
4e9b9b4724 Merge pull request #2328 from Areloch/neverImportMat 
Adds a filter for materials to never import when importing a shape
 2019-05-04 11:51:21 -05:00
Areloch
ddfc416418 Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing 2019-05-04 11:49:42 -05:00
OTHGMars
2638559f94 Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. 2019-04-25 16:05:21 -04:00
OTHGMars
70bbad8411 Sequence timing options. 
This commit deals with the problem that the keyframe timestamps are not standardized. Seconds, milliseconds and ticks are used depending on the import format. There is no metadata or property that specifies the format used, so the option is exposed to the user as part of the import options gui.
 2019-04-22 06:52:59 -04:00
OTHGMars
6694d5f206 Adds Force Update Materials to import options gui. 2019-04-22 00:09:29 -04:00
OTHGMars
93e7f8da84 Initial value selections for import options gui. 2019-04-18 16:49:51 -04:00
OTHGMars
bd486bab66 Changes default winding order to be CCW. 2019-04-15 23:04:47 -04:00
OTHGMars
55c01fc4ca Enables the assimp import options gui when loaded from the shape editor. 
Adds new assimp options to the importer gui.
Copies the importer gui to the BaseGame template.
 2019-04-15 19:03:10 -04:00
Areloch
5cefad72b3 Failed to get the Scene changes for the Full template rolled up. This corrects that. 2019-03-31 22:12:38 -05:00
Areloch
59b6e67ecf Merge pull request #2043 from John3/toolShapes_3 
cleaning the modules
 2019-03-31 14:41:35 -05:00
Areloch
a71b8864cf Merge branch 'development' into SnapToMenu 2019-03-31 14:32:17 -05:00
Areloch
6daf0c8d34 Merge pull request #2338 from Areloch/MoreMenubarFixes 
Fixes some outstanding menubar problems.
 2019-03-31 12:39:31 -05:00
Areloch
5facfe5b61 Merge pull request #2326 from Areloch/colorblindnessVisualizers 
Adds visualizers for various types of colorblindness
 2019-03-30 16:32:06 -05:00
Areloch
3a93a30ced Fixes a crash that comes from toggling the editors on and off, then clicking a menubar item 
Fixes the menubar not resizing with the Window
Fixes the Editors Menubar item not being repopulated if the editor was closed/reopened
Fixes the Physics menubar item not appearing if the editor was closed/reopened
Fixes issue where findMenu could fail if the StringTableEntry happened to trip against a different capitalization.
 2019-03-16 02:38:40 -05:00
Areloch
87ee749801 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00
Areloch
34d05ff16f Updates to various components, added a few new ones. 2019-02-24 01:50:38 -06:00
Areloch
a7a5463ad1 Adds a filter for materials to never import when importing a shape 2019-02-23 22:04:17 -06:00
Areloch
1f58050e47 Adds visualizers for various types of colorblindness to help calibrate scene's visual clarity given certain vision impairments. 
(Also corrects some erroneous pathing in the other render visualizers to match)
 2019-02-23 20:28:59 -06:00
Areloch
9bf8337e4a Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way. 2019-02-23 15:55:28 -06:00
Areloch
2721732b5c Merge pull request #2272 from Areloch/CoreModuleification 
Core module-ification
 2018-10-12 00:39:48 -05:00
Areloch
878b68cc39 Module-ified core structure. 2018-09-02 03:53:13 -05:00
Ratfish Studios
fea3724f4e Rearranges the right-mouse click popup menus for the world editor and gui editors to a) be organized more logically and b) be more flexible. 
This also fixes some insecure behavior relying on %this value eval'ing, which has also been modified to be better.

Also fixes up some old calls for getting menubar menus by internal name, which is no longer supported, instead using the findMenu function call.
 2018-05-08 00:30:15 -05:00
Areloch
619191bf4f Merge pull request #2202 from Areloch/ScriptObject_PopupFixes 
Removes the GameObject folder insert for the scripted object creator grid
 2018-02-14 01:28:56 -06:00
Areloch
6ac08c6290 Updates the basegame template as well. 2018-02-14 01:03:25 -06:00
Areloch
7af3de2517 Merge pull request #2189 from Areloch/AnimationAssetImprovements 
Bugfixes and improvements for the animation component and related assets
 2018-02-13 14:54:38 -06:00
Areloch
7e0e46d66c Removes the folder insert for the scripted object creator grid, which was causing a UI screwup making the scripted objects overlap and jumble up. 
Also reorgs the popup controls to match what's in the BaseGame template's setup, which should fix editor popups.
 2018-02-12 00:02:20 -06:00
Areloch
86f8677cff Merge pull request #2185 from John3/old_dml 
delete old dml
 2018-02-10 18:32:55 -06:00
Areloch
14ae287c0c Bugfixes and improvements for the animation component and related asset behavior. 
Adds in ability to establish a shape animation asset as being cyclic or blended.
Adds functionality for blended animations to integrated into shapeAssets.
 2018-02-04 14:31:28 -06:00
Areloch
cfbdf63cd7 Merge pull request #2184 from rextimmy/isNotSky 
removed isSky from template sky material files.
 2018-02-04 13:22:13 -06:00
Johxz
dd68bf660e delete old dml 2018-01-31 20:46:17 -06:00
rextimmy
e35857ba92 removed isSky from template sky material files. 2018-02-01 07:42:36 +10:00
Areloch
e9dbe788f6 Added useful new icons for the editors. 2018-01-28 15:32:31 -06:00
Areloch
1278cf22a2 Initial implementation of the Asset Browser tool. 2018-01-28 15:30:17 -06:00
Areloch
d22e7c98e1 Cleanup of the editor load function 2018-01-28 15:28:58 -06:00
Areloch
c729f603b8 Added convenience function to take control of selected entity if it supports it. 2018-01-28 15:27:51 -06:00