Commit graph

365 commits

Author SHA1 Message Date
Areloch
ff871f37e3 Added refactor of Editor Settings window
Various fixes for asset handling.
WIP of crash tracking
2019-06-03 02:47:30 -05:00
Areloch
6073bc5551 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
d1308c3aba 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
f5bf70b584 Catch the template files up and add the improved convex editor bits. 2019-05-19 21:30:45 -05:00
Areloch
ae11d3548d Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch
82881f0875 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
54b4d2eaaf
Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ
Snap to terrain Z offset.
2019-05-04 14:25:03 -05:00
Areloch
9c46187082
Merge pull request #2324 from Areloch/TweakedguiTreeViewObjectHandling
Tweaks some object handling of guiTreeViewObj
2019-05-04 11:51:03 -05:00
AzaezelX
97ec99f704 Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
Areloch
d96b07e230
Merge pull request #2338 from Areloch/MoreMenubarFixes
Fixes some outstanding menubar problems.
2019-03-31 12:39:31 -05:00
Areloch
e7c485b113
Merge pull request #2340 from Areloch/popupMenuBGFix
Makes the popups correctly operate anywhere in the space of the canvas
2019-03-31 12:36:15 -05:00
Areloch
b43dacc7d3
Merge pull request #2322 from Areloch/add3dProjectionCtrl
Adds gui3DProjectionCtrl
2019-03-31 02:14:45 -05:00
Areloch
3c14ec2413
Merge pull request #2320 from Areloch/setFieldHeight
Allows special inspectorFields to override their height
2019-03-30 16:31:21 -05:00
Areloch
8ee1f92ba4
Merge pull request #2319 from Areloch/Scenes
Initial implementation of the Scene object
2019-03-30 16:30:34 -05:00
Areloch
9a760c721e
Merge pull request #2321 from Areloch/textApplyFocus
Updates TextEdit value when focus is lost.
2019-03-30 16:07:18 -05:00
Areloch
2311120cbc
Update guiSplitContainer.cpp
Corrected typo.
2019-03-30 14:40:58 -05:00
Areloch
a438cda47f Makes the popups correctly operate anywhere in the space of the canvas
Also corrects a notional issue where if a poup extends past the bottom of the screen, it'll instead appear above the mouse so it doesn't ever get cut off.
2019-03-17 02:33:54 -05:00
Areloch
7b01b42e15 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
d18ab265be
Update gui3DProjectionCtrl.cpp
Corrected file capitalizations for linux
2019-02-23 20:12:17 -06:00
Areloch
138ab8a8bf Tweaks some handling of guiTreeViewObj so you don't necessarily have to delete an object if you delete the tree item, as well as the ability to look up the object id via tree item.
Also removes spam in the event that an item on the tree is more of a data representation rather than literal object.
2019-02-23 18:01:14 -06:00
Areloch
a949326cab Adds gui3DProjectionCtrl so a gui control can be tracked to a point in 3d space 2019-02-23 16:36:40 -06:00
Areloch
b865e1d181 Updates TextEdit value when focus is lost. 2019-02-23 16:18:03 -06:00
Areloch
837b936bae Allows special inspectorFields to override the height they use in the rollouts 2019-02-23 16:08:47 -06:00
Areloch
1c2f90a190 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
21aa13e0f0 Adds ability to set the split point of a guiSplitContainer 2019-02-23 13:55:29 -06:00
Areloch
e7314dfa09
Merge pull request #2305 from Azaezel/copyCleanup
corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
2019-02-20 23:12:58 -06:00
Marc Chapman
0ffb99e7d4 Adds the capability to add a small offset to the Z value of items being told to snap to terrain 2019-02-12 03:14:01 +00:00
suncaller
5e8e7e7bf8 Clean up redundant variables 2019-02-06 15:03:06 -05:00
suncaller
7f7e402c42 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Azaezel
951e302cb1 corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
pretty sure the offending leak-line creeps in with
 561f010f2e/Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.cs (L34)
comparative release/debug results in
string gridBitmap = "\c0"
vs
string gridBitmap = "ic\c1Gl\c0"
and the relavent initpersistfields entry of TypeString points to
561f010f2e/Engine/source/console/consoleTypes.h (L71)
which is likely causing malformation
2019-01-28 21:04:51 -06:00
Areloch
e0cf7b8702
Merge pull request #2294 from OTHGMars/GuiInputCtrl
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
OTHGMars
2f3b3e87c2 Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Azaezel
a5bdbd47a2 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel
8e534dd0c9 Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel
450080de6a corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
Areloch
a4770c19b5 Deleting a probe in the editor now automatically does a cleanup of it's baked cubemap files
Also added it to do the prefilter/irrad processing on any StaticCubemap selected.
2018-12-10 00:46:28 -06:00
Areloch
738e2d5088
Merge pull request #2258 from Areloch/OthroCameraFix
Fixes the front/back ortho views in the editors
2018-12-09 15:35:38 -06:00
Areloch
8c2e27057e
Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch
3a71c75596
Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch
8605c3115d Initial WIP of the Modern Editor Layout 2018-12-08 12:50:31 -06:00
Areloch
ef5e3a5271 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Areloch
d2a78b0a82
Merge pull request #2250 from Areloch/popupMenuFixesPR
Fixes various incorrect popup menu behaviors.
2018-09-05 13:06:26 -05:00
OTHGMars
8b14790c93 Adds features to GuiInputCtrl
This commit adds three new features to the GuiInputCtrl. All three default to off, so it is fully backward compatible with existing scripts. The new options are:
sendAxisEvents – If true, the control will generate onAxisEvent() callbacks for all axis events. This is useful for binding joystick/controller axes to game actions.
sendBreakEvents – If true, the control will generate onInputEvent() callbacks for SI_BREAK events for all keys and buttons. By default the callback is only triggered for break events on modifier keys.
SendModifierEvents – If true SI_MAKE events for modifier keys will generate callbacks. By default, only the break events are sent for modifier keys.
2018-07-18 20:35:59 -04:00
Ratfish Studios
ad48c81d1f Fixes the front/back ortho views in the editors to comply with art tool standards. 2018-05-21 01:32:01 -05:00
Ratfish Studios
7af34fa432 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
Azaezel
59130078e2 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
2018-04-23 10:08:14 -05:00
Lukas Joergensen
bc435a3b33 Eliminate ConsoleFunction and ConsoleMethod, replace with DefineEngineStringlyVariadic 2018-04-20 22:09:58 +02:00
Lukas Joergensen
323206a796 Eliminate ConsoleStaticMethod 2018-04-20 20:27:09 +02:00
Lukas Joergensen
2e6133af48 Eliminate unnecessary uses of ConsoleMethod 2018-04-17 22:36:32 +02:00
Lukas Joergensen
3c99ef73a9 Eliminate DefineConsoleMethod 2018-04-17 21:01:50 +02:00