TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-09 14:31:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1540 commits 5 branches 33 tags 958 MiB
Commit graph

1540 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch 2f69ffd2d4 Fixes issue #1277 
Adds the file path to the saveDataFile call (missionpath\missionname.forest as the format)

This correctly utilizes the forest object's datafile field if it's set.
If not, it will create a new forest item with the missionPath\missionName.forest convention.

This also removes the checks for the hardcoded "theForest" forest object name, so that if it is renamed for some reason, it doesn't break.

Lastly, this corrects a minor semi-related bug, where if you are in the forest editor and have a brush selected, and then click to paint, but no forest object currently exists, it prompts to create one. Once the forest object is created, it would trigger the editor to inspect the newly made forest object. If you attempted to paint the currently selected brush, there was a mis-match in the inspector information, and it would trigger a crash.

This has been corrected by re-initializing the forest editor's selected tool mode so it can be utilized immediately after the forest object is created.
 2015-04-27 21:45:57 +10:00
Azaezel f8d41a2b96 Merge pull request #1283 from Azaezel/randiiiiiii 
corrects getrandom to behave as documented.
 2015-04-26 11:27:03 +10:00
Daniel Buckmaster 656c04abc7 Merge pull request #1278 from eightyeight/tweak-vagrant 
Tweak Vagrant
 2015-04-20 10:27:30 +10:00
Daniel Buckmaster 4a705c875c Move the Vagrant config into a distro-specific folder. 2015-04-19 16:18:03 +10:00
Daniel Buckmaster fac856c053 Merge pull request #1269 from eightyeight/add-vs2012-to-empty 
Added missing VS2012 template files to Empty template
 2015-04-08 12:23:08 +10:00
Daniel Buckmaster 21443df641 Added missing VS2012 template files to Empty template. 2015-04-07 18:15:47 +10:00
Luis Anton Rebollo 8f94614a6e Merge pull request #1169 from eightyeight/add-vagrant 
Add Vagrant config
 2015-03-15 01:26:18 +01:00
Luis Anton Rebollo 19534b1312 Merge pull request #1255 from BeamNG/php_gen_vs2012 
Missing files for PHP genetator VS2012
 2015-03-14 22:46:52 +01:00
LuisAntonRebollo b5378d226d Add VS2012 support. Missing files 2015-03-14 22:46:15 +01:00
Luis Anton Rebollo c73355bcd6 Merge pull request #1049 from cornytrace/VS2012-Support 
Add VS2012 support to projectgenerator
 2015-03-14 22:43:37 +01:00
Luis Anton Rebollo 68efa70d9c Merge pull request #1245 from BeamNG/fix_glsl_include 
Fix GLSL include when file is empty.
 2015-03-14 13:31:10 +01:00
Luis Anton Rebollo 24307947ef Merge pull request #1252 from BeamNG/fix_alt_enter 
Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode.
 2015-03-14 13:03:41 +01:00
LuisAntonRebollo 17f08e9f86 Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode. 2015-03-14 13:01:05 +01:00
Luis Anton Rebollo 3c12325e97 Merge pull request #1249 from Azaezel/shadow_safeties 
further insurance that shadow split stay within bounds.
 2015-03-10 12:39:51 +01:00
Azaezel 6fa44a4e92 further insurance that shadow split stay within bounds. 2015-03-10 06:03:40 -05:00
Daniel Buckmaster 67e9119101 Merge pull request #1246 from BeamNG/fix_obj_editor_lod 
Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files.
 2015-03-09 11:32:27 +11:00
LuisAntonRebollo a5497e51a7 Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files. 2015-03-08 23:51:13 +01:00
LuisAntonRebollo e6b7cf108b Fix GLSL include when file is empty. 2015-03-08 23:25:23 +01:00
Luis Anton Rebollo f87b3f2da7 Merge pull request #1243 from eightyeight/simplify-readme 
Simplify readme
 2015-03-08 22:55:48 +01:00
Luis Anton Rebollo 825912e800 Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations 
DeferredBumpFeat order of operations corrections
 2015-03-08 22:49:27 +01:00
LuisAntonRebollo ae3128b28b DeferredBumpFeat order of operations corrections. Clean. 2015-03-08 22:30:03 +01:00
Luis Anton Rebollo 7e7025d1ca Merge pull request #1238 from Azaezel/defaultNormal 
https://github.com/GarageGames/Torque3D/issues/770 resolution
 2015-03-08 22:12:24 +01:00
LuisAntonRebollo 1067da284f Add error msg to Shadergen when GBufferConditioner?LSL::processVert don't have normals defined. 2015-03-08 22:10:22 +01:00
Daniel Buckmaster 338666a0a4 Fixed a link and removed link to GitHub releases. 2015-03-09 07:51:33 +11:00
Luis Anton Rebollo 946e74817e Merge pull request #1242 from BeamNG/fix_rpath 
Fix Linux rpath.
 2015-03-08 21:00:11 +01:00
LuisAntonRebollo 30bf15f4ee Fix Linux rpath. Changed to use $ORIGIN. 2015-03-08 20:40:35 +01:00
Luis Anton Rebollo 0e346fed9f Merge pull request #1241 from J0linar/Vignette_Final 
vignette_final
 2015-03-08 18:43:10 +01:00
Luis Anton Rebollo d9ebe10c90 Merge pull request #1244 from BeamNG/fix_water_hdr 
Fix waterBasicP.glsl for HDR.
 2015-03-08 13:00:34 +01:00
LuisAntonRebollo 049de72cc5 Fix waterBasicP.glsl for HDR. 2015-03-08 12:56:24 +01:00
Daniel Buckmaster 8a3c299123 Format license. 2015-03-08 16:48:41 +11:00
Daniel Buckmaster 76d713f179 Shortened the readme and updated links. 2015-03-08 16:47:13 +11:00
LuisAntonRebollo 265d1a540a Fix Linux rpath. 2015-03-07 22:41:00 +01:00
Miodrag Sejic 351d5f08e9 vignette_final 
+added: gui slider for maximum exposure of vignetting
+changed: shaders to logical min/max floats
this pr contains the glsl shaders as well and therefore makes the
https://github.com/GarageGames/Torque3D/pull/1225 Pull Request obsolete
 2015-03-07 14:03:12 +01:00
Daniel Buckmaster 74a05854d5 Merge pull request #1236 from eightyeight/revert-style-cleanup 
Revert recent style cleanup changes
 2015-03-05 07:54:37 +11:00
Azaezel bc32da74ca https://github.com/GarageGames/Torque3D/issues/770 resolution suggested by @LuisAntonRebollo 2015-03-03 23:10:47 -06:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Daniel Buckmaster a73850a4bb Merge pull request #1234 from Azaezel/colladaCalamity 
typofix for void ColladaAppMesh::lockMesh
 2015-03-02 19:35:53 +11:00
Azaezel c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06:00
Daniel Buckmaster 33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
 2015-03-01 22:30:22 +11:00
Daniel Buckmaster baf594aee7 Merge pull request #1006 from BeamNG/fix_lighting_with_zero_lights 
Fix lighting errors when all lights are disabled.
 2015-03-01 21:06:34 +11:00
Daniel Buckmaster 57eed9c8e4 Amend console stack fixes to work with gcc in Ubuntu x64. 2015-03-01 20:34:16 +11:00
Daniel Buckmaster 6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development 
Conflicts:
	Engine/source/console/console.cpp
 2015-03-01 20:33:29 +11:00
Daniel Buckmaster 497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning 
Fix some issues flagged by cppcheck
 2015-03-01 18:27:40 +11:00
Daniel Buckmaster 5118d4bc63 Merge pull request #1230 from Azaezel/notSoShocking 
removal of  un-implemented ShockwaveData entries from explosion.
 2015-03-01 18:27:21 +11:00
Nathan Bowhay bc31d79da1 Changed type to NetSocket 
Changed some S32 types to use the typedef NetSocket since they are a
socket.
 2015-03-01 17:20:48 +11:00
Daniel Buckmaster bd6c331dfc Merge pull request #1215 from eightyeight/naveditor-default-background 
Default to background navmesh builds
 2015-03-01 17:15:42 +11:00
Daniel Buckmaster 6822a78fcf Merge pull request #1067 from Lopuska/patch-13 
bugfix #1066
 2015-03-01 14:17:59 +11:00
Daniel Buckmaster 4aeaad91e7 Merge pull request #1218 from eightyeight/revert-1036 
Revert "PR for issue #748"
 2015-03-01 14:14:00 +11:00
Daniel Buckmaster 18cc91000e Merge pull request #1220 from eightyeight/fix-#396 
Fix #396
 2015-03-01 14:13:50 +11:00
Azaezel 0c10ba6833 removal of un-implemented ShockwaveData entries from explosion. 2015-02-27 20:24:47 -06:00