TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2795 commits 5 branches 33 tags 958 MiB
Commit graph

241 commits

Author SHA1 Message Date
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
James Urquhart 212ac36cc1 Tidy up indentation in openvr changes 2016-09-11 22:51:00 +01:00
James Urquhart 1198932e87 Basic fix for reflections in both stereo rendering modes 2016-09-11 22:42:42 +01:00
James Urquhart fa7697b13e Fix debug draw in SBS mode & reflection update timing 2016-09-11 22:42:42 +01:00
James Urquhart 784f6f92d8 Fix lens flare in side-by-side view 2016-09-11 22:42:42 +01:00
James Urquhart 694dd4abfa Fix stack overflow 2016-09-11 22:42:42 +01:00
James Urquhart 734688ff7e Implement basic keyboard & mouse support for openvr overlays 2016-09-11 22:42:42 +01:00
James Urquhart f91aa639d6 Remove projection offset, add the hmd head matrix. Also tidy up a few things. 2016-09-11 22:42:42 +01:00
James Urquhart da6bcbeb2b Improvements to openvr code 
- Overlays are implemented (sans input for the moment)
- Fixed a problem where the movemanager was using the wrong values for hmd rotation & position
 2016-09-11 22:42:42 +01:00
James Urquhart 9f49a7844e Use correct multiplication order for eye transform. Also fix displayDevice not set bug. 2016-09-11 22:42:42 +01:00
James Urquhart 9e5eda9a08 More progress 
- Fixed normal stereo rendering
- Beginnings of vr overlay code
 2016-09-11 22:42:42 +01:00
James Urquhart 36908b0434 Add code to render the basic stereo view fallback 2016-09-11 22:42:42 +01:00
James Urquhart ba91478fad Baseline working openvr code 2016-09-11 22:42:42 +01:00
James Urquhart 3dc2100765 Ignore alpha when rendering debug texture 2016-09-11 22:42:42 +01:00
James Urquhart 64b751a7c8 Basic port of code 2016-09-11 22:42:42 +01:00
Azaezel db50887c05 addresses C4101 warnings ('identifier' : unreferenced local variable) 2016-07-31 11:00:37 -05:00
Areloch e79e5eb616 Merge pull request #1608 from irei1as/patch-1 
Set textures as bitmapctrl in script
 2016-07-07 00:16:01 -05:00
Areloch 95e4d99bb6 Merge pull request #1675 from Azaezel/guiBitmapColoration 
adds bitmap coloration to:
 2016-07-06 20:10:16 -05:00
Areloch b3adaf7f96 Merge pull request #1672 from Areloch/SDLPopupMenus 
Sdl popup menus
 2016-07-06 13:17:23 -05:00
Azaezel f8368cd7e9 adds bitmap coloration to: guibitmapctrl, guibitmapbarctrl, guianimbitmapctrl (and guicrosshairhud by way of inheritance) 2016-07-06 02:15:46 -05:00
Areloch 46308aaaa3 Merge pull request #1669 from Azaezel/guiBitmapBarCtrl 
New: GuiBitmapBarCtrl
 2016-07-05 00:22:04 -05:00
Azaezel 01051e4182 new: guiAnimBitmapCtrl - works similar to the particle animation system. feed it x and y for how many frames in a spritesheet, and let her run. 
also supports:
either specific frames, a range to play, or a mix (string)
fps specification, (int)
loop, (bool)
pausing, (bool)
reverse (bool)
 play (bool)
and has callbacks for onLoop, onCompleted, and onFrame (index and actual frame passed along)
 2016-07-04 20:44:42 -05:00
Areloch 818b617972 Implements the right-mouse popup menus in the editor in SDL to make it match to Windows. 2016-07-04 16:01:49 -05:00
Azaezel 36ec6c1b59 New: GuiBitmapBarCtrl 
clipped bitmap. by default clips the right hand side based on (the percent entry/100).
options:
vertical clips the bottom
flipClip inverts direction (so vertical off would remove bits from the left, vertical on from the top)
 2016-06-30 15:51:03 -05:00
Areloch db41a0b30f Merge pull request #1548 from Azaezel/alphamaskedButtons 
alpha masking for buttons. original attribution @dottools
 2016-06-08 02:04:42 -05:00