Commit graph

266 commits

Author SHA1 Message Date
Areloch fad103e4b1 Merge pull request #2126 from Areloch/FixComponentEditorDisplay
Fixes the inspector/component editor to display components
2018-01-10 13:12:35 -06:00
Areloch f43bb6b565 Merge pull request #2059 from Bloodknight/SaharaUndo
#define AUTOPAINT_UNDO
2018-01-10 09:47:24 -06:00
Areloch b5277e0f08 Fixes the inspector/component editor to display the components attached to an entity correctly in the inspector. 2017-12-03 01:21:30 -06:00
Areloch 7f134ed76e Merge pull request #2096 from Areloch/GetCursorPosLocal
Adds a function to get the cursor position in local coords
2017-10-26 02:42:03 -05:00
Areloch 526d4ea31a Remove unneeded isParent handling for entities in the GuiTreeViewCtrl 2017-10-18 00:35:37 -05:00
Areloch 0c21ef1b45 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch 4ea3c90b5b Adds a function to get the cursor position in local coords 2017-10-15 04:02:43 -05:00
Areloch 6479c7592a Merge pull request #2088 from Areloch/EditorTool
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Areloch f9b7f66571 Merge pull request #2089 from Areloch/VariableInspectorRefactor
Updates the VariableInspector, VariableGroup and VariableField objects
2017-09-27 15:31:26 -05:00
Areloch 629a25185d Updates the VariableInspector, VariableGroup and VariableField objects to actually be useful. In addition to the original functionality of being able to have a var name passed in and search for all vars with that in it, it also lets you build out a completely custom Inspector.
Unlike the regular Inspector, which requires a specific object or objects, from which the fields are pulled from, this lets you manually create fields, which can tie into any given object and their fields, global vars, and also not only supports the engine types for fields, but also triggers a callback to script if a field type is not found allowing fully custom fields to be handled as needed.
2017-09-21 02:49:36 -05:00
Areloch bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Areloch f8702b717b Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
Marc Chapman 4df27e2109 Merge branch 'feature/SaharaUndo' into SaharaUndo 2017-07-30 11:26:21 +01:00
Marc Chapman 9d547537fd canvas -- Added a way for a child control to handle an event but still have GuiCanvas::processInputEvent() return false, therefore allowing the event to also be handled by the ActionMap. (see DemoGame::processInputEvent()) . Also added methods for clearing "down" status of mouse buttons in cases where ActionMap grabs the mouse for dragging and masks the up events from GuiCanvas.
fade-gui-ctrl -- adds fading capability to GuiControl.
2017-07-26 22:20:43 +01:00
Areloch 25686ed4be Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Areloch edd1e0a270 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
Areloch 124ecb2fe0 Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Masquara 15f67015d3 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch ed14b6fced Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Azaezel f1d315d51a adds an atGizmo option - for now drops a new object at a given singular mesh position. TODO: at the center of a given group. 2017-02-26 18:34:32 -06:00
Azaezel 1458494b2a applies mUseGroupCenter checks across the board 2017-02-22 15:49:26 -06:00
Azaezel ebdd441833 adds a useGroupCenter var/button to allow folks to use non-itterative snapping, and defaults it to do so (maintains prior functionality envelope) 2017-02-22 14:31:26 -06:00
Azaezel 7d2315c781 sets snap to grid to itterate through selected objects and settle them into the nearest (seected value), ie 1, 2.5, 3.33 ect. 2017-02-22 00:36:53 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 0c6174b045 Merge pull request #1920 from elfprince13/variadicConsoleTemplates
Variadic console templates
2017-01-12 23:32:03 -06:00
Thomas "elfprince13" Dickerson 27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Anis 55b7a8431c Merge pull request #1800 from Azaezel/andOrMaybe
clang reports: unclear || + && and &+| mixes.
2017-01-07 02:31:05 +01:00
Thomas "elfprince13" Dickerson 88106f9032 Fixed type inference for nulls in console functions 2017-01-06 17:18:37 -05:00
Anis d164781329 Merge pull request #1829 from irei1as/patch-1
Adding depth option to the texture of guiOffscreenCanvas
2017-01-02 11:52:36 +01:00
Azaezel d42b1a6be8 colorPicker/swatch srgb display.
dependency from @rextimmy: tolinear and togamma for color+lumnance.
2016-12-22 06:37:34 -06:00
Azaezel dd071484da Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe
Conflicts:
	Engine/source/T3D/staticShape.cpp
2016-12-20 22:50:28 -06:00
Areloch eb2d3a908a Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does. 2016-12-11 23:02:13 -06:00
Areloch 1d754cbbad Makes it so prefabs can correctly 'export to collada' by running the buildPolyList function on it's children.
Also adds a 'Bake Selection to Mesh' option to the tools menu in the editor to export the selected mesh to a collada file, and then replaces the selection with a TSStatic.
2016-12-10 17:27:27 -06:00
Azaezel 2652f9a609 Fills out the automaticly filled inspector entries for AbstractClassRep::FieldFlags::FIELD_ComponentInspectors with a pressable button. 2016-12-01 01:07:53 -06:00
Areloch 48610d2eb1 Merge pull request #1773 from Areloch/findByObjectFix
GuiInspector's findByObject method fix.
2016-11-23 00:30:55 -06:00
irei1as a7952bfe1d Add a fix to the depth for the target texture
Fix to the named texture to have the 3d depth correctly rendered if a 3d view is inside the guiOffscreenCanvas.
It's disabled by default so it shouldn't change anything to projects that use guiOffscreenCanvas without the texture (like Oculus rendering).
2016-11-22 16:30:29 +01:00
irei1as 8b43ff3465 Update guiOffscreenCanvas.h
Variables to add depth in the .cpp file.
2016-11-22 16:20:18 +01:00
Areloch 3ab2f98ec3 Fixes up some erroneous behavior with Simgroup parentage.
Fixes Prefab creation handling of SceneObjects and SimGroups.
Fixes SceneObjects where the default icon incorrectly defaulted to the simgroup folder rather than the generic class object when the class has no specific class icon.
2016-10-26 00:49:05 -05:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Areloch 121d65215e Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang. 2016-10-17 01:00:12 -05:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
2016-10-14 18:16:55 -05:00
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel c57b1a8b70 clang reports: unclear || + && and &+| mixes. 2016-10-14 17:26:13 -05:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
Areloch af2ac4472e renames the engine method arg to avoid name confusion. 2016-09-14 19:42:05 -05:00