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

189 commits

Author SHA1 Message Date
Daniel Buckmaster
f0333aabfd Merge pull request #1281 from Areloch/issue1257 
Fix for issue #1257
 2015-07-01 22:47:27 +10:00
Daniel Buckmaster
39f0e269d6 Merge pull request #1328 from GarageGames/release-3.7 
Release 3.7
 2015-06-24 19:00:57 +10:00
Areloch
9368b7b915 Adjusted the popup issue fix to ensure nothing breaks in either regular or oculus mode. 2015-06-01 22:34:55 -05:00
Areloch
f5d8de8c4d Fixed an issue where non-occulus builds didn't correctly push pop-up dialogs to the canvas. 2015-06-01 22:01:29 -05:00
Areloch
66ebe9da23 Replaces the old road texture with a newer one in the Empty template to match the new one in the Full template. 2015-05-27 23:46:56 -05:00
Daniel Buckmaster
7a54e300e3 Merge pull request #1305 from eightyeight/vignette-settings 
Apply vignette settings properly for #1302
 2015-05-22 16:27:24 +10:00
Daniel Buckmaster
5fcf385aca Added toolbar expand button images. 
I wonder when they disappeared.
 2015-05-17 19:05:02 +10:00
Daniel Buckmaster
9cfc852192 Apply vignette settings properly for #1302. 2015-05-16 17:52:58 +10:00
James Urquhart
3a457749ec Oculus VR DK2 Support 
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
 2015-05-06 23:09:51 +01:00
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
Areloch
977791bad2 Fixes #1257 
The editor didn't test that a mission area actually existed, so when you switched to the editor, it would trigger the crash.

It now tests if there is a mission area when switching to the editor tool, and if there is not, prompts for the creation of a new one, similar to the auto-prompt for creating terrain blocks.
 2015-04-22 23:42:32 -05:00
Daniel Buckmaster
21443df641 Added missing VS2012 template files to Empty template. 2015-04-07 18:15:47 +10:00
LuisAntonRebollo
a5497e51a7 Fix GuiTreeViewCtrl::getParentItem incorrent use in ShapeEditor script files. 2015-03-08 23:51:13 +01:00
Luis Anton Rebollo
0e346fed9f Merge pull request #1241 from J0linar/Vignette_Final 
vignette_final
 2015-03-08 18:43:10 +01:00
LuisAntonRebollo
049de72cc5 Fix waterBasicP.glsl for HDR. 2015-03-08 12:56:24 +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
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
d069534bde Default to building navmeshes in the background. 2015-02-22 10:47:29 +11:00
LuisAntonRebollo
3ad04d050c Fix shadows on Basic Lighting. 2015-02-15 22:26:05 +01:00
Luis Anton Rebollo
44da177b75 Merge pull request #1167 from eightyeight/no-web-deploy 
Remove default web deployment
 2015-02-08 15:59:53 +01:00
Daniel Buckmaster
6a96894a9c Merge pull request #1157 from eightyeight/linux-no-splash 
Show the canvas immediately in unix because the splash doesn't work
 2015-02-08 20:19:31 +11:00
Daniel Buckmaster
50c52a1cdb Remove default web deployment. 2015-02-08 20:11:23 +11:00
Daniel Buckmaster
a6702d1331 Show the canvas immediately in unix because the splash doesn't work. 2015-02-08 19:31:02 +11:00
Luis Anton Rebollo
2d3f711443 Merge pull request #1128 from Azaezel/cloudlayer 
cloudlayer hdr packing
 2015-02-07 20:50:29 +01:00
Luis Anton Rebollo
d26c846c31 Merge pull request #1140 from Lopuska/patch-18 
ambient normal on GLSL
 2015-02-07 20:43:08 +01:00
LuisAntonRebollo
1dacf7b04e Fix torqueConfig.h TORQUE_FRAME_SIZE. 2015-01-31 19:34:14 +01:00
Daniel Buckmaster
bd437cda1c Merge branch 'development' into walkabout 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
 2015-01-29 21:38:20 +11:00
Daniel Buckmaster
d7111bc851 Fix missing scripts and incorrect variable. 2015-01-29 21:23:16 +11:00
Anis
40edb6b7d4 Update vectorLightP.glsl 2015-01-28 23:48:20 +01:00
Anis
bfbfed6d66 Update vectorLightP.glsl 2015-01-28 23:47:44 +01:00
Anis
1c5ab1371e Update lighting.glsl 2015-01-28 23:47:02 +01:00
Azaezel
86770cb3c1 cloudlayer hdr packing 
fixes for #1126
 2015-01-25 17:56:17 -06:00
Luis Anton Rebollo
84d072f25c Merge pull request #1027 from bpay/ambient-normals 
Allow normals on shadowed surfaces
 2015-01-24 23:05:51 +01:00
LuisAntonRebollo
3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
LuisAntonRebollo
aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
LuisAntonRebollo
21d58bb191 Modified files for SDL2. 2015-01-19 00:33:23 +01:00
Daniel Buckmaster
7ab6731f51 Merge branch 'development' into walkabout 
Conflicts:
	Templates/Empty/game/tools/worldEditor/scripts/editors/creator.ed.cs
	Templates/Full/game/tools/worldEditor/scripts/editors/creator.ed.cs
 2015-01-02 14:45:20 +11:00
Daniel Buckmaster
2410f4b899 Redid nav editor icons. 2015-01-02 14:42:18 +11:00
Luis Anton Rebollo
9eb05b2bdc Merge pull request #1083 from BeamNG/opengl_intel_WIP 
Fix/walkaround for OpenGL on Intel
 2014-12-27 01:13:14 +01:00
Daniel Buckmaster
7d376386d1 Merge pull request #1074 from Azaezel/AccuVolumes_2 
Accumulation volumes
 2014-12-26 13:18:00 +11:00
LuisAntonRebollo
4e530f413e Fix glowBlurP.glsl shader. 2014-12-25 19:40:42 +01:00
Daniel Buckmaster
c85ac03c16 Merge pull request #1020 from eightyeight/simdictionary-improvement 
SimDictionary improvement
 2014-12-24 09:54:54 +11:00
Daniel Buckmaster
450a6c6c80 Merge pull request #969 from eightyeight/options-for-godrays 
Added settings for god-ray PostFX.
 2014-12-22 14:52:09 +11:00
Azaezel
c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
Daniel Buckmaster
4af7227559 Fixed some ranges. 2014-12-21 23:20:48 +11:00
Daniel Buckmaster
154be2ae0e Merge pull request #974 from Azaezel/sound_provider_fallback_request 
re-orders sound device provider wieghting
 2014-12-21 19:06:06 +11:00
Azaezel
98048fd974 Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles 
Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
 2014-12-16 18:48:28 -06:00
LuisAntonRebollo
cf195152d6 Workaround for OpenGL terrain blend on Intel drivers. 2014-12-16 00:30:50 +01:00
Daniel Buckmaster
61e106251d Made toolbar resize intelligently. 2014-12-15 11:22:44 +11:00
LuisAntonRebollo
0718875ac3 OpenGL Intel - Fix a error on DOF_DownSample_P.glsl. 2014-12-11 22:58:02 +01:00