Commit graph

517 commits

Author SHA1 Message Date
Daniel Buckmaster 9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix
3 textures blending fix
2014-11-04 17:06:04 +11:00
Daniel Buckmaster 97ae3445c9 Merge pull request #793 from lukaspj/Terrain-Basetex-Formats
Terrain basetex formats
2014-11-04 14:54:08 +11:00
Daniel Buckmaster ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation
Ribbon and RibbonNode
2014-10-28 15:19:17 +11:00
Daniel Buckmaster b88d3fde1f Merge pull request #829 from jamesu/namespace_link
Add console function to link namespaces
2014-10-28 14:12:46 +11:00
Daniel Buckmaster 19f91fee2b Added a setPosition function. 2014-10-28 14:10:22 +11:00
Daniel Buckmaster e02e542717 Merge pull request #749 from lukaspj/MixedParticleRendering
Re-enable Mixed particle rendering
2014-10-28 09:50:02 +11:00
Daniel Buckmaster a4f7182de5 Fix omissions in astNodes.cpp. 2014-10-28 08:55:17 +11:00
Daniel Buckmaster 81a385094f Merge pull request #842 from eightyeight/console-func-refactor
jamesu's console function refactor
2014-10-24 00:42:58 +11:00
Daniel Buckmaster 2f416290ab Merge pull request #788 from eightyeight/return-status-code
Allow return status to be specified using quitWithStatus
2014-10-24 00:31:05 +11:00
Daniel Buckmaster 4c07c55121 Merge branch 'development' into console-func-refactor
Conflicts:
	Engine/source/console/compiledEval.cpp
2014-10-20 09:29:44 +11:00
Daniel Buckmaster 376db9e097 Merge pull request #705 from andr3wmac/ConsoleReturnFix
Fix for unexpected behavior described in issue #704
2014-10-19 19:45:15 +11:00
Daniel Buckmaster 156aacf8b8 Ensure console function arg arrays are initialised. 2014-10-16 00:29:16 +11:00
James Urquhart a22254ad0a Add console function to link namespaces 2014-10-14 18:52:02 +01:00
Daniel Buckmaster 561e26ea07 Merge pull request #721 from Azaezel/CubemapCleanup
deprecated functionality. T3D handles this in the reflector class.
2014-10-14 21:19:57 +11:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
2014-10-14 15:09:11 +11:00
Daniel Buckmaster 0fb7266dbe Merge pull request #148 from eightyeight/simfindobject
Prevented looking up incorrect object handles
2014-10-14 13:56:33 +11:00
Daniel Buckmaster 06a4db295a Bump version to 3.6.1. 2014-10-06 14:51:39 +11:00
Areloch 4716f76d5e Merge pull request #737 from Azaezel/queryStallPrevention
Query Stall Prevention
2014-10-01 23:48:53 -05:00
Azaezel d5c42d0d44 Yikes. fatalityfix: need to create a platformtimer for the reference. 2014-10-01 23:35:06 -05:00
LuisAntonRebollo 1edf978933 Merge pull request #796 from eightyeight/version-3.6
Bump version numbers
2014-10-02 01:32:53 +02:00
LuisAntonRebollo 535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
LuisAntonRebollo 42386b3f6f Merge pull request #795 from BeamNG/T3D_x64
Support for Windows x64 builds
2014-10-02 01:31:07 +02:00
LuisAntonRebollo 4a6384486c Merge pull request #689 from rextimmy/forest_physx2_fix
Physx 2.8 actor release fix
2014-10-02 01:05:11 +02:00
Daniel Buckmaster 47020b580c Merge pull request #794 from Azaezel/euler_to_quat_revert
Euler to quat reversion
2014-09-30 18:59:37 +10:00
Areloch f56c35019f Merge pull request #781 from eightyeight/remove-player-warnings
Removed annoying warning
2014-09-30 00:03:58 -05:00
Areloch cbf3078343 Merge pull request #763 from rextimmy/tsmesh_createtangents_fix
- Added check in tsMesh::createTangents to check size of incoming normal...
2014-09-29 23:16:34 -05:00
Areloch 4c0811ffb1 Merge pull request #722 from Azaezel/Implicit_Truncations
implicit truncation warning cleanup.
2014-09-29 23:03:52 -05:00
Areloch eeb97ffa4c Merge pull request #616 from BeamNG/water_object_use_shader_param
Fix WaterObject TODO: Retrieve sampler numbers from parameter handles, see r22631.
2014-09-29 22:52:43 -05:00
Daniel Buckmaster bedde94a9f Removed all local type definitions for GCC. 2014-09-29 14:31:07 +10:00
Daniel Buckmaster fae1bad96c All unit tests that run now pass. 2014-09-29 11:38:44 +10:00
Daniel Buckmaster b173e5571c Moved async packet queue test and commented it out. 2014-09-29 11:38:42 +10:00
Daniel Buckmaster 178484ca6a Moved zip tests and commented them out :(. 2014-09-29 11:38:37 +10:00
Daniel Buckmaster d02cc94edd Allow test runs to be non-verbose. 2014-09-29 11:38:34 +10:00
Daniel Buckmaster b01e5668b4 Removed dead unit test code from main loop. 2014-09-29 11:38:32 +10:00
Daniel Buckmaster ff67ac3e80 Fixed some spacing. 2014-09-29 11:38:31 +10:00
Daniel Buckmaster 1008236053 Bump version numbers. 2014-09-26 13:11:29 +10:00
LuisAntonRebollo df37afac34 Fix Torque 64 define. 2014-09-26 00:10:14 +02:00
Azaezel f678a19be8 Testing using the regenerating turret https://github.com/Azaezel/Torque3D/tree/outpost_testbed_clean shows that tracking is precisely inverted using 8b1ff267f0 (diff-983ceaf4b3cbddd4701734aaa048a79e) . reversion PR till someone has time to properly review whether that's fouled conversion on my part, or if turrets were accounting for bad math to start with. 2014-09-23 19:15:43 -05:00
Daniel Buckmaster 9f47032522 Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
Daniel Buckmaster f5fb2fdf76 Improved code style in ribbon files. 2014-09-24 08:08:42 +10:00
Lukas Joergensen ef11b565bf Expose new formats to the editor. 2014-09-23 15:23:04 +02:00
LukasPJ 431d8a9b66 Terrain baseTex support multiple formats
DDS, PNG, JPG or NONE
2014-09-23 15:22:57 +02:00
Lukas Joergensen f2a3a1e2a6 Enable RGB format for DDS files getting copied to bitmap. 2014-09-23 13:47:14 +02:00
Daniel Buckmaster 94d32b5fae Make mSubscribers case-insensitive. 2014-09-21 22:50:47 +10:00
Lukas Joergensen a8a141e73c RibbonNode class.
Simple RibbonNode class for an implementation similar to that of
ParticleEmitterNodes. Datablock currently has no static fields.
2014-09-19 00:32:17 +02:00
Lukas Joergensen cb9cfea1c4 Ribbon class implementation.
This class is based on Tim Newell from MaxGaming Technologies code, it's a
Ribbon class which is easy to use from other classes.
2014-09-19 00:31:56 +02:00
Daniel Buckmaster d08e594316 Merge pull request #682 from Azaezel/extended_onendSequence
Extended onend sequence
2014-09-16 10:25:25 +10:00
Azaezel db089ab45f consistency 2014-09-15 19:10:23 -05:00
Daniel Buckmaster 6fdebd16f6 Merge remote-tracking branch 'jamesu/simplify_compiler_ast' into x64
Conflicts:
	Engine/source/console/compiler.cpp
	Engine/source/console/compiler.h
2014-09-15 11:50:32 +10:00
Daniel Buckmaster 439dc9c56d Fixed ShapeBase animation networking.
We essentially just need to remember to Update ShapeBase::Thread::position
every time we advance the thread in the shape. With a little bit of
supporting code these changes will be passed to the client's shape.
2014-09-15 10:01:13 +10:00