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

1937 commits

Author SHA1 Message Date
rextimmy 46037622c9 D3DPER debug events for DX11 2016-12-23 15:59:32 +10:00
rextimmy 4857e89ca8 D3D11 fullscreen fix 2016-12-23 15:43:45 +10:00
rextimmy 48dc2551c4 GFXD3D11StateBlock improvements 2016-12-23 15:08:23 +10:00
rextimmy 983b3211ed D3D11 Feature level 10 support and D3D11 device cleanup. 2016-12-23 15:00:07 +10:00
rextimmy 415f4a046e OpenGL vsync fixes. 2016-12-23 13:59:55 +10: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
Areloch fb9bd03073 Merge pull request #1859 from rextimmy/multicanvas_gl_dx11 
Multiple canvas support for GL and DX11
 2016-12-20 23:36:13 -06:00
Areloch 5750933d07 Merge pull request #1868 from rextimmy/gl_nonpot_fix 
GL::Workaround::noCompressedNPoTTextures profile is no longer used
 2016-12-20 23:20:07 -06:00
Areloch 78993a85dd Merge pull request #1877 from jamesu/default_port_fix 
Default port fix
 2016-12-20 23:12:51 -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
James Urquhart 46edd46634 Use correct address in multicast print 2016-12-20 23:52:31 +00:00
Areloch e00bd847fd Fixes Bullet not supporting holes in terrain. 2016-12-20 00:05:30 -06:00
James Urquhart 41085f9298 Fix setting the default client port. Also fix fallback multicast address define. 2016-12-17 23:08:43 +00:00
rextimmy ab41fe713c GL::Workaround::noCompressedNPoTTextures profile is no longer used nor relevant. #1863 2016-12-15 14:50:51 +10:00
Duion 2bbc07ebf1 missing comma 2016-12-15 03:14:54 +01:00
rextimmy 08c0195cba OpenGL multiple canvas support 2016-12-14 22:01:18 +10:00
rextimmy efab1299ca DX11 multiple canvas support 2016-12-14 21:24:44 +10: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 54456fa4fa Merge pull request #1855 from John3/updateRecast151 
Updated recast to 1.5.1
 2016-12-12 19:54:07 -06:00
Areloch 2cdc596b86 Merge pull request #1854 from JeffProgrammer/SDL_textinput_fix 
fix SDL text events from generating a ~ key when opening the console
 2016-12-11 23:07:18 -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 8ec88a26b6 Merge branch 'ColladaExportutilities' of https://github.com/Areloch/Torque3D into development 2016-12-11 22:47:52 -06:00
Jeff Hutchinson 3ecbb4b7e5 fix bug with SDL text input that occurs when multiple responders occur on the screen. (Tested with 2 responders.) 2016-12-11 19:11:32 -05:00
Azaezel c6e2563a38 went overzealous on the bitangent cleanup when reviewing parallax. the W multiplier can and should stay. the y flip can remain gone. 2016-12-11 15:04:33 -06:00
Johxz c7e5b35744 Updated recast to 1.5.1 2016-12-11 13:17:15 -06:00
Jeff Hutchinson f6b8ef126d fix SDL text events from generating a ~ key when opening the console 2016-12-11 13:53:11 -05: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
Areloch 06f32342ab Merge branch 'development' into fix467_exportCollada 2016-12-09 21:09:12 -06:00
Johxz f610c7ab24 fix atlas texture, extra info for opencollada 2016-12-09 16:29:23 -06:00
Areloch 0c2a5be23e Merge pull request #1847 from Azaezel/ParallaxLight 
factoring in tangentW causes parallax to swap specular highlight directions.
 2016-12-08 01:57:08 -06:00
Azaezel a5755be681 factoring in tangentW casues parallax (but not normals) to swap specular highlight directions. removed that, as well as a prior attempted workaround. 2016-12-06 23:30:35 -06:00
Areloch de1f002adc Merge pull request #1846 from CouleeApps/background-fix 
Fix SDL/Mac report going into the background
 2016-12-05 09:06:14 -06:00
Areloch 7fac8b75e1 Merge pull request #1836 from Azaezel/shadowSlips 
motion based updates for shadow caching
 2016-12-05 09:01:06 -06:00
Areloch e996cf25fb Merge pull request #1843 from rasteron/development 
Update version.h
 2016-12-04 23:03:03 -06:00
Glenn Smith ad30641499 SDL/Mac report going into the background 2016-12-04 17:24:27 -05:00
Areloch a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr 
Preliminary IPV6 Support
 2016-12-04 16:22:42 -06:00
Areloch 4b25b59185 Merge pull request #1835 from Areloch/MoarMath 
Adds some helpful utility math functions.
 2016-12-04 15:38:20 -06:00
Areloch a98301a315 Merge pull request #1839 from Azaezel/pathPresentation 
directional coloration for pathnodes,
 2016-12-04 15:38:14 -06:00
Areloch 40ec9ad8be Merge pull request #1840 from Azaezel/FIELD_ComponentInspectors_button 
FIELD_ComponentInspectors inspector hook up
 2016-12-04 15:38:01 -06:00
Johxz c43de8881f added materials, better compatibility with maya and 3ds max, better collada spec for compliance 2016-12-03 16:59:17 -06:00
Raster Ron a3f9365347 Update version.h 2016-12-03 19:41:38 +08:00
Duion f090d8ca03 version change to 1.0.7.0 2016-12-02 15:01:48 +01: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
Azaezel 1f6e66a1d7 directional coloration for pathnodes, as well as enlarges both the look and handle size for ease of use. 2016-12-01 00:55:27 -06:00
RexTimmy d46f82ef1d re-enable face culling for the terrain 2016-12-01 11:03:32 +10:00
Johxz 6cc1c27fd2 missing to load the texture 2016-11-29 19:49:41 -06:00
Azaezel 55b26be9ba account for fov change (also, internal docs) 2016-11-29 15:57:41 -06:00
Azaezel 01419d7935 motion based updates for shadow caching 
adds a $pref::Shadows::teleportDis and $pref::Shadows::turnRate (defaults 4, and 1 respectively)
if either is exceeded during a given frame, shadow chaches are forced to refresh themselves.
 2016-11-29 14:13:23 -06:00
Areloch 31ed509c1c Adds some helpful utility math functions. 2016-11-28 22:42:29 -06:00
Areloch 5fbc24d9e2 Also adds a sanity check in the event a splash image isn't found. 2016-11-27 16:21:52 -06:00
James Urquhart fba471d27e Fix console spam when OS socket send buffer is full 2016-11-27 18:02:19 +00:00
James Urquhart 1f69a708fb Fix ret assignment 2016-11-27 17:58:34 +00:00
Areloch 6cad7b6248 Merge pull request #1830 from pacomont/Fix_NavMeshUpdate_not_working 
Fix  for NavPath is not updated when navMesh has change.
 2016-11-27 10:29:29 -06:00
Johxz b2f615915e remove old colladamax format, fixed up bad coordinates, added new collada format, valid against the COLLADA 1.4.1 schema, added to load textures and UVs. 2016-11-26 14:13:54 -06:00
Areloch cf065ed536 Merge pull request #1585 from Areloch/execToCon 
Make exec() and getDSOPath() proper Con namespace functions.
 2016-11-26 02:04:38 -06:00
Areloch 248a240c04 Merge pull request #1766 from JeffProgrammer/gladdev 
Replace Epoxy with Glad
 2016-11-24 13:53:29 -06:00
Francisco Montañés García 87fb2d827b I's not working because onNavMeshUpdate string comparation will never succeed. 
DefineEngineMethod(NavPath, onNavMeshUpdate, void, (const char *data),,
   "@brief Callback when this path's NavMesh is loaded or rebuilt.")
{
   if(object->mMesh && !dStrcmp(data, object->mMesh->getIdString()))
      object->plan();
}
 2016-11-24 19:09:00 +01:00
Jeff Hutchinson 14cd94ddc9 glx extension fix for GLX windowing api 2016-11-24 12:41:30 -05:00
Jeff Hutchinson 15a10a78cc suppress API_ID_REDUNDANT_FBO on the debug callbacks. This is a temporary fix so that glad can get pushed into devhead. 2016-11-24 12:35:39 -05:00
Areloch 6097c48c5d Merge pull request #1824 from Areloch/hideDynamicRefreshField 
Hides the light's dynamic refresh rate field in the editor
 2016-11-23 08:44:32 -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
Johxz 69ecdc67fb fix issue #696 2016-11-12 08:30:30 -06:00
Areloch 4c457b7f94 Hides the light's dynamic refresh rate field to avoid confusion, leaving only the static refresh rate field to be edited. 2016-11-09 23:46:34 -06:00
Areloch 1e671bfc7a Updates SDL to 2.0.5 2016-11-08 20:49:49 -06:00
Areloch 00a4a21e3f Merge pull request #1790 from blackwc/guihealthbarhud-flip 
GuitHealthBarHud flip fill
 2016-11-02 22:28:21 -05:00
Jeff Hutchinson 0296e6d3fd Fix merge conflict and add check for unix and not apple for glx 
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
 2016-11-02 21:55:24 -04:00
James Urquhart 2ed4978cb9 Fix connecting on OSX 2016-10-28 19:34:01 +01:00
James Urquhart 5b1bb6547a Fix lookup issue on TCPObject. Also sync with working code. 2016-10-28 18:31:47 +01:00
James Urquhart 458bc27ea4 Add missing include 2016-10-28 11:33:43 +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
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
Areloch 1a851f167d Merge pull request #1807 from Azaezel/boxBaseBorked 
clang catch: boxBase's getPlanePointIndex method wasn't returning values in all cases.
 2016-10-24 01:28:25 -05:00
Areloch fd99f976a6 Merge pull request #1798 from Azaezel/UUID_unmangle 
clang: format_token string format correction
 2016-10-24 01:27:38 -05:00
Areloch 269b195355 Merge pull request #1804 from Azaezel/greatestZero 
clang: unsigned>0 checks
 2016-10-24 01:27:14 -05:00
Areloch e8aff85322 Merge pull request #1808 from Azaezel/consistentCallbacks1 
clang: consistent callbacks
 2016-10-24 01:25:09 -05:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2 
more unused variable cleanups
 2016-10-23 21:04:36 +02:00
RexTimmy 3a0a720115 OpenAL-soft for windows 2016-10-22 09:22:33 +10:00
Anis bd4f2b002d Merge pull request #1801 from Azaezel/registerRemoval 
clang: register type modifier deprecated
 2016-10-21 20:04:42 +02:00
Areloch 33f4ead242 Merge pull request #1803 from Azaezel/chasingElsey 
clang: trailing else
 2016-10-21 01:42:14 -05:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight 
clang: constructor initialization order
 2016-10-19 08:39:12 -05:00
Areloch d8644e0426 Merge pull request #1813 from Azaezel/loopyLines 
clang catch: garbage in line directives
 2016-10-19 00:10:09 -05:00
Areloch 74c67e8409 Merge pull request #1814 from Azaezel/unstrungHeros 
garbage char in string
 2016-10-18 22:46:29 -05:00
Areloch 65f25cb0e6 Merge pull request #1796 from Azaezel/notSoEasy 
retooled circular ease methods
 2016-10-18 22:41:31 -05:00
Azaezel c5fa0557b5 garbage char in string 2016-10-18 11:44:25 -05:00
Azaezel 4bc1491714 clang catch: garbage in line directives 2016-10-18 11:37:18 -05:00
Azaezel 5e1b6cbc48 clang: trailing else 2016-10-18 08:58:15 -05:00
Areloch 5349bad5ca Merge pull request #1809 from dud3/patch-1 
refactor: spacing on function call parameters
 2016-10-17 23:52:08 -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
Dren Kajmakci e267cd7c80 refactor: spacing on function call parameters 2016-10-17 02:24:34 +02:00
Azaezel 5f5466d90d clang: consistent callbacks 2016-10-16 16:54:11 -05:00
Azaezel 8d4dd14144 clang catch: boxBase's getPlanePointIndex method wasn't returning values in all cases. 
assertfatal doesn't do anything in release builds, so also added a failure enum.
 2016-10-16 15:31:56 -05:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Anis 3038e53856 Merge pull request #1799 from Azaezel/pragmaProblem 
clang catch: pragma note. (no longer needed)
 2016-10-16 03:25:02 +02: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 0e896a9a02 clang: unsigned>0 checks 2016-10-14 18:09:22 -05:00
Azaezel aa614f60f8 clang: unsigned>0 checks 2016-10-14 18:04:11 -05:00
Azaezel d30dedd7c5 clang: trailing else 2016-10-14 17:57:20 -05:00
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel dd0b7914e6 clang: register type modifier deprecated 2016-10-14 17:37:00 -05:00
Azaezel c57b1a8b70 clang reports: unclear || + && and &+| mixes. 2016-10-14 17:26:13 -05:00
Azaezel a8f9249f77 clang catch: pragma note. (no longer needed) 2016-10-14 17:04:17 -05:00
Azaezel ae5f61e60d clang: format_token string format correction 2016-10-14 16:28:06 -05:00
Azaezel 2f5321ddfb tabs/space + transcription typofix 2016-10-14 13:40:53 -05:00
Azaezel d50762cbef self modifying variables made clang unhappy. retooled circular ease methods 
basis: http://gizma.com/easing/#circ1
 2016-10-14 13:00:27 -05:00
Areloch 1131ed15df Merge pull request #1785 from rextimmy/mac_port_clean 
MacOS platform support
 2016-10-12 16:54:24 -05:00
Azaezel 8121408029 doc correction 2016-10-12 10:24:17 -05:00
Azaezel e12536efcd distance needs to be returned as a float. 2016-10-12 10:19:04 -05:00
Areloch 3432fbcd7a Merge pull request #1770 from Areloch/SDLMouseModsFix 
Makes sure the key modifiers are passed along with mouse actions.
 2016-10-10 14:28:50 -05:00
blackwc 3bc4711e07 add flip fill to guiHealthBarHud 2016-10-09 18:22:27 -04:00
Areloch e77642f6cb Merge pull request #1786 from jamesu/datachunker_mem 
Reduce the amount of blocks of memory DataChunker uses
 2016-10-09 13:56:42 -05:00
Anis 98b52d1fed Merge pull request #1782 from pacomont/Fix_AbstractPolyList_addBox 
Fixes AbstractPolyList::addBox(). Complete each face with missing 2nd triangle.
 2016-10-08 19:15:28 +02:00
James Urquhart d324abd2df Fix redundant memcpy in swizzle ToBuffer method 2016-09-30 18:41:10 +01:00
James Urquhart c2cc7142de Reduce the amount of blocks of memory DataChunker uses 2016-09-30 18:35:14 +01:00
RexTimmy 7281c2ed18 64bit shadergen hash key support. 2016-09-28 11:13:55 +10:00
RexTimmy 3b1d84fe5c SDL & Win32 platform threads cleanup. 2016-09-28 11:13:25 +10:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
yourarcade 8d610787a2 Fix push/pop mismatch bug;add code to properly rotate, translate and render needle. 2016-09-25 17:48:27 -07:00
yourarcade 213b7020a3 Allow the gui to render for both vehicles and vehicle-mounted players. 2016-09-25 16:53:00 -07:00
Anis 57dfeb829a Merge pull request #1774 from Azaezel/terrainTrouble 
embeds blendtotal into the low bit for the normal|depth buffer
 2016-09-23 23:23:26 +02:00
Francisco Montañés García 596b88cf94 Complete each face with 2nd triangle. 2016-09-21 12:43:48 +02:00
RexTimmy a7f6841c0c .gitignore to exclude cmake generated config_types for libogg 2016-09-18 12:35:23 +10:00
Anis edb6bd214c Merge pull request #1779 from rextimmy/oggTheoraDecoder_revert 
Revert TORQUE_CPU_X64 changes to oggTheoraDecoder
 2016-09-17 23:31:23 +02: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 e7972bd6a9 Merge pull request #1772 from pacomont/Fix_crash_when_saving_NavMesh_file_without_Links 
Fix crash when saving NavMesh file without Links
 2016-09-17 21:28:08 +02:00
Anis ddd5ef1a8d Merge pull request #1778 from rextimmy/libpng_update 
Libpng update to 1.6.25 (fixes x64 crashing on exit)
 2016-09-17 21:12:59 +02:00
RexTimmy 7b21b69dcb Revert TORQUE_CPU_X64 changes to oggTheoraDecoder.cpp 2016-09-17 10:52:43 +10:00
RexTimmy d6a6298a9a Libpng update to 1.6.25 (fixes x64 crashing on exit) 2016-09-17 10:41:29 +10:00
rextimmy 2ec38f98cc Update libogg to 1.3.2 2016-09-16 11:42:00 +10:00
Areloch af2ac4472e renames the engine method arg to avoid name confusion. 2016-09-14 19:42:05 -05:00
Azaezel 598fb758f3 embeds blendtotal into the low bit for the normal|depth buffer for terrains to support multi-pass blending. 2016-09-14 15:35:35 -05:00
Francisco Montañés García 800b7d1fd4 Write Links only when mLinkIDs.size() > 0 2016-09-14 13:08:20 +02:00
Areloch c0a46ec1f1 Makes sure the key modifiers are passed along with mouse move and wheel inputs when using SDL. 2016-09-14 02:18:21 -05:00
Areloch ab68a19a8b Merge pull request #1750 from Azaezel/LODloss 
short term LOD correction
 2016-09-14 01:47:23 -05:00
Areloch 6dbfe77ddb Added a missed a preprocessor for when not using openVR. 2016-09-14 00:59:55 -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
Areloch f88975121d Merge pull request #1761 from Bloodknight/intrinsicsfix 
Intrinsicsfix
 2016-09-13 21:43:18 -05:00
James Urquhart 455aa99046 Add missing bracket 2016-09-13 10:24:23 +01:00
Jeff Hutchinson cfb3ad598f SDL support for glad 2016-09-11 21:59:48 -04:00
Jeff Hutchinson 8fc96e8744 add glad license and remove epoxy cmake 2016-09-11 21:48:55 -04:00
Jeff Hutchinson ac0f869da1 remove epoxy 2016-09-11 21:48:48 -04:00
Jeff Hutchinson 11c3314f66 implement glad into torque. 2016-09-11 21:48:42 -04:00
Jeff Hutchinson 63c8262d26 add glad 2016-09-11 21:48:29 -04:00
James Urquhart 212ac36cc1 Tidy up indentation in openvr changes 2016-09-11 22:51:00 +01:00
James Urquhart e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +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 de48afc00c USe correct frustum projections in reflections in separate rt mode 2016-09-11 22:42:42 +01:00