Duion
aff033dd0d
Merge branch 'GarageGames/master' into ueberengine-dev
...
Conflicts:
Engine/source/windowManager/sdl/sdlWindowMgr.cpp
Tools/CMake/torque3d.cmake
3.10 final update
2017-03-23 20:36:21 +01:00
Areloch
2db03e47e9
Fixes a crash when you try to delete things without being in selection mode in the forest editor. Adds a sanity check that everything is properly set up before attempting the delete action.
...
Also adds a fix to the mesh item tab in the forest editor to correct odd selection behavior that could erroneously cause selection of two items in the list when you only clicked one.
2017-02-04 22:45:49 -06:00
Areloch
8985cbb0d3
Merge pull request #1894 from John3/enableVideoRecording
...
enable video recording
2017-01-30 18:26:50 -06:00
Areloch
ca4204be14
Merge pull request #1933 from Areloch/SDLMenubarFixins
...
Fixes editor handling of menubars when opening/closing.
2017-01-30 13:31:46 -06:00
Areloch
f8b650f7a1
Reworks the open/close functions of the gui and world editors so they will properly toggle between and clean up when closed.
2017-01-21 17:11:54 -06:00
Areloch
ec8b657b71
Adds support for multiple textures used in the strike rendering per @RichardsGameStudio's help.
2017-01-19 19:15:50 -06:00
Areloch
6a204f3528
Missed removing the old BMP splash for the new PNG one.
2017-01-16 00:16:17 -06:00
Areloch
f02d0d6c4e
Hooks the splash window code up to the same image loading code as the icon code, and also adds a check if it tries to load a BMP for either(this is a bad format and really shouldn't be used for pretty much anything).
...
Also includes a icon for the templates.
2017-01-16 00:09:55 -06:00
Areloch
713c93d328
Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development
2017-01-15 23:37:06 -06:00
Areloch
8a39f5e7b6
Merge pull request #1896 from rextimmy/physics_shapes
...
PhysicsShapeData examples
2017-01-04 02:23:28 -06:00
rextimmy
a3173b566e
PhysicsShapeData examples
2017-01-03 10:24:47 +10:00
Johxz
731981dbb6
Unused preDemoRecord()
2017-01-01 22:17:45 -06:00
Johxz
5e47c018b2
enable video recording
2017-01-01 21:40:41 -06:00
Johxz
260f108693
added torque SimView tool
2016-12-28 15:25:55 -06:00
Areloch
7688042112
Merge pull request #1888 from Azaezel/updateEmpty
...
brings empty up to date for core and shader dirs
2016-12-27 22:15:41 -06:00
Areloch
b19aba2e54
Merge pull request #1879 from Azaezel/sRGBSwatch
...
colorPicker/swatch srgb display.
2016-12-27 22:11:02 -06:00
Azaezel
13c57e6562
brings empty up to date for core and shader dirs
2016-12-27 10:28:03 -06:00
Azaezel
646c62d9f4
HDR review: remove from reflections, kill depth check, order of operations corrections.
2016-12-27 10:24:49 -06:00
Azaezel
d42b1a6be8
colorPicker/swatch srgb display.
...
dependency from @rextimmy: tolinear and togamma for color+lumnance.
2016-12-22 06:37:34 -06:00
Areloch
170cdadf60
Fixes window icons with SDL, hooking it through the var $Core::windowIcon as the path.
...
Also adjusted the splash window icon to use the var $Core::splashWindowImage for it's path.
2016-12-22 00:52:34 -06:00
Duion
186604eb76
Merge branch 'GarageGames/development' into ueberengine-dev-3.10
...
Conflicts:
Engine/source/app/version.h
Engine/source/terrain/terrData.cpp
2016-12-13 17:28:36 +01: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
Johxz
681b049e93
remove dml file
2016-12-09 16:39:06 -06:00
Areloch
f77e4b960d
Merge pull request #1848 from Azaezel/ParallaxPinch
...
[workaround] pinches parallax steps so the 0-1 range has minimal artifacting
2016-12-08 01:57:23 -06:00
Azaezel
0049678c25
[workaround] pinches parallax steps so the 0-1 range has minimal artifacting
2016-12-06 23:41:28 -06:00
Areloch
a3740719b1
Merge pull request #1817 from jamesu/ipv6_pr
...
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Areloch
1e89337825
Merge pull request #1821 from Areloch/platformgenericmenucatch
...
Sanity check for if the GuiPlatformGenericMenuBar class
2016-11-26 02:01:32 -06:00
Areloch
92493c3851
Merge pull request #1706 from Areloch/LinearDetailTextures
...
Tweaks the detail textures for the terrain
2016-11-26 00:42:35 -06:00
Areloch
c947b70af6
Merge pull request #1819 from Areloch/PrefabTabFolderFix
...
Fixes prefabs in root dirs having extra folders in creator.
2016-11-23 00:47:57 -06:00
Areloch
97ac826e44
Corrects the specular handling as per Richard's suggestion in #1783
2016-11-09 00:12:35 -06:00
Areloch
36f679f539
Sanity check for if the GuiPlatformGenericMenuBar class is valid before trying to load a menubar that uses it, in the event that SDL isn't enabled, or other similar circumstances.
2016-11-08 23:39:07 -06:00
Areloch
15db25c0b8
Fixes minor issue where if a prefab was in one of the root directories rather than further in the heirarchy, it would incorrectly add a folder of the prefab's name that contains the prefab in the creator menu's prefabs tab.
2016-10-26 00:51:05 -05:00
James Urquhart
704577e051
Preliminary IPV6 Support
2016-10-25 19:09:02 +01:00
RexTimmy
dd64004eaf
MacOS platform support.
2016-09-28 11:09:48 +10:00
Anis
9cb413a38d
Merge pull request #1763 from Azaezel/linearBuffers
...
banding: conforms misbehaving postfx to the hdr buffer format
2016-09-17 21:31:31 +02:00
Anis
a1983af225
Merge pull request #1762 from Azaezel/specularOrderOfOperations
...
lightbuffer (aka brightness and shadow) always comes last as a mul
2016-09-17 21:30:02 +02:00
Areloch
bb27535597
Fixes the Toggle Children Lock and Toggle Children Hidden options in the editor context popup menu.
2016-09-14 01:41:49 -05:00
Areloch
7e4095d610
Merge pull request #1688 from jamesu/dx11_openvr_pr
...
Basic OpenVR Support code
2016-09-14 00:24:20 -05:00
James Urquhart
64b751a7c8
Basic port of code
2016-09-11 22:42:42 +01:00
Areloch
32afa6209b
Merge pull request #1682 from Areloch/EmptyTemplateTools
...
Duplicating changes in the tools folder over to the Empty template
2016-09-10 22:30:49 -05:00
Azaezel
57bd962b33
linearizes fog color so it falls within the same scale system as ambient and the like
2016-09-05 22:18:44 -05:00
Azaezel
125b7aa636
banding: conforms misbehaving postfx to the hdr buffer format until we have a proper srgb compatible buffer to minimize that with
2016-09-05 22:16:49 -05:00
Azaezel
b204518344
lightbuffer (aka birghtness and shadow) always comes last as a multiplier
2016-09-05 22:12:36 -05:00
Duion
eaa28844c9
BadBehavior added
2016-08-12 20:39:56 +02:00
Azaezel
07224ecd97
vec3 variants for toLinear and toGamma
2016-08-09 14:05:54 -05:00
Areloch
3b3e0c7db5
Tweaks the detail textures for the terrain to work better with the linear pipeline.
2016-07-27 23:45:32 -05:00
Areloch
10df58f716
Duplicating changes in the tools folder over to the Empty template for parity.
2016-07-09 20:08:25 -05:00
Areloch
a2a4b1c5e3
more case sensitivity corrections.
2016-07-09 16:07:57 -05:00
Areloch
8424f99052
Some case sensitivity fixes.
2016-07-09 14:57:42 -05:00
