Commit graph

216 commits

Author SHA1 Message Date
Luis Anton Rebollo
6492028bb2 Merge pull request #1035 from bpay/memfixes
Memfixes
2015-01-25 13:42:32 +01:00
Luis Anton Rebollo
ea0e3fd683 Merge pull request #1096 from bpay/fix-include-guards
Fix include guards
2015-01-24 23:02:13 +01:00
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo
3336bffad2 Changes for Linux. 2015-01-19 01:44:36 +01:00
Ben Payne
3574ef838b Fix erroneous include guards 2015-01-06 00:42:09 -05:00
Daniel Buckmaster
e9308e40ed Merge pull request #998 from rextimmy/physx3_cpu_dispatcher_fix
Fixed issue where physx3 cpu dispatcher was created multiple times
2014-12-29 14:14:05 +11:00
Daniel Buckmaster
ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Daniel Buckmaster
3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +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
9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
Daniel Buckmaster
8a104a5222 Merge pull request #1018 from eightyeight/ghost-scoping
Add the option to limit ghost scoping range
2014-12-21 19:03:02 +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
fe9c30b5bb Lowercase TSStatic fied names. 2014-12-12 22:41:08 +01:00
LuisAntonRebollo
8f4c0ed95d Fix spaces in TSStatic fied names. 2014-12-12 22:36:08 +01:00
Ben Payne
c50c88d071 Fix use-after-delete errors 2014-12-11 19:09:01 -05:00
Ben Payne
d97d44f66f Fix more misc uninitialized vars 2014-12-11 18:25:29 -05:00
Daniel Buckmaster
a928d142f7 Made some tweaks so I'm happy with it.
* Removed #defines
 * Fall back to using visible distance if ghost distance is not used
 * Removed ghost distance from level files as it will default
 * Renamed mConnectionVisibleDistance for consistency
2014-12-07 19:14:06 +11:00
Daniel Buckmaster
e0436efc21 Merge pull request #910 from Winterleaf/StaticShapeAlphaLod
Added distance fading to TSStatic objects.
2014-12-07 18:15:13 +11:00
Anis
830ab77628 Fixed a crash and memory leak on the ribbon code
OpenGL needs to unlock buffers on inverse order to work.
2014-12-02 13:39:57 +01:00
rextimmy
880642060e Fixed issue where physx3 cpu dispatcher was created multiple times 2014-12-01 12:39:46 +10:00
LuisAntonRebollo
1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
Daniel Buckmaster
a0e1fca057 Merge pull request #685 from rextimmy/physx3_basic
Physx3 Physics Plugin
2014-11-29 20:05:08 +11:00
Daniel Buckmaster
e47b95ee5d Merge pull request #971 from Azaezel/revert-794-euler_to_quat_revert
turret tracking correction, again
2014-11-29 14:00:04 +11:00
LukasPJ
30a8401d14 Add support for rendering particles to the glow buffer 2014-11-28 23:34:26 +01:00
Vincent Gee
c5f81a85f5 Renamed LOD to Fade. 2014-11-20 08:00:26 -05:00
Areloch
b5ce3fa8ad Merge pull request #903 from Winterleaf/MissionMarker
Looks good, don't see any problems. Merged.
2014-11-13 21:48:58 -06:00
Azaezel
034de4f84b turret tracking correction 2014-11-08 00:08:09 -06:00
rextimmy
664595ef9e - Fixed memory leak when creating terrain with physx 3
- Fixed terrain tessellation with physx 3
2014-11-08 14:08:59 +10:00
Vincent Gee
7b05314901 fixed tabs 2014-11-06 10:44:55 -05:00
Vincent Gee
c4e3a68f7c Added Alpha LOD to tsStatic objects.
This allows designers to set the start and end distance for Alpha LOD on objects.
2014-11-06 08:54:49 -05:00
Vincent Gee
578c4e8f4f Removed Tabs, added check on connection 2014-11-06 08:38:05 -05:00
Vincent Gee
2f48f31a6f Fixed String comparisons. 2014-11-05 23:29:08 -05:00
Vincent Gee
55bdfe5dc3 This adds limiting the ghost data to a specific area around the client.
By default it is not included in the build, you must #define GHOSTSCOPING in the torqueConfig.h to enable it.
The distance can be set via the mission file by adding

visibleGhostDistance = "1000";

Or if it is not set in the mission file it will default to what is defined in torqueConfig.h #defined as GHOSTSCOPING_DEFAULT_DISTANCE_IF_NOT_IN_MISSION

The mission default distance can be overridden on a per connection basis by using gameconnection:setVisibleGhostDistance and gameconnection:getVisibleGhostDistance

The logic for setting the scoping distance was moved from shapebase in the original design to SceneObject so that it will affect cameras, players, etc.
2014-11-05 23:14:39 -05:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee
fbc9660bc3 WaypointTeam never worked and if you look at the code you can see its not very clean. 2014-11-04 20:14:50 -05:00
Vincent Gee
9907c4592e Fixed bad string compares and simdictionary 2014-11-04 19:51:13 -05:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster
a87a891cfc Prevent crash when loading Player with no shape. 2014-10-31 10:04:32 +11:00
Daniel Buckmaster
e209cc4389 Use existing methods instead of incorrect maths. 2014-10-31 09:11:07 +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
74e328d09b Merge pull request #870 from eightyeight/fix-ear-transform
Andrew's fix for ear transform with detached camera
2014-10-28 14:39:09 +11:00
Daniel Buckmaster
355ce5d854 Andrew's fix for ear transform with detached camera. 2014-10-28 09:26:46 +11:00
Daniel Buckmaster
fd93397e5d Merge pull request #846 from Azaezel/guiobjectview
guiobjectview corrections
2014-10-27 17:28:58 +11:00
Daniel Buckmaster
4fb820c3ef New Physics doc group. 2014-10-24 09:17:48 +11:00
Azaezel
0dde7022c2 engine: corrects offsets for the guiobjectview gui element which displays materialized meshes, and exposes it's specialized renderering system to the postfx subsystem.
immediate purpose: corrected display
long term purpose: deferred display.
2014-10-23 05:03:28 -05:00
bank
62006e8b3c Remove unneeded double-initialization of the vars. 2014-10-19 14:30:46 +11:00
bank
d9c5670e93 Fix possible array overrun.
We should clamp the index value to the size of the weaponMountNode[], which is ShapeBase::MaxMountedImages (4) and SceneObject::NumMountPoints = 31.
2014-10-19 14:30:43 +11:00
Daniel Buckmaster
1554ea6faf Merge pull request #833 from just-bank/fix-derefptr
Fix: Null'ed pointer usage, possible access violation.
2014-10-16 10:38:52 +11:00
Daniel Buckmaster
156aacf8b8 Ensure console function arg arrays are initialised. 2014-10-16 00:29:16 +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