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

899 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Buckmaster
ed820f2dd4 Merge pull request #761 from J0linar/PostFx_Vignette 
Added Vignette PostFx
 2014-11-04 13:30:47 +11:00
Daniel Buckmaster
378a933894 Merge pull request #690 from rextimmy/bullet_282 
Bullet Physics Library 2.82 update
 2014-11-02 07:54:48 +11:00
Daniel Buckmaster
278c621f22 Re-add unit testing module 
During the move from the project manager repo, the testing
module definition appears to have disappeared. It's back now.
 2014-10-31 13:02:31 +11:00
Daniel Buckmaster
72c25dda60 Merge pull request #843 from eightyeight/move-projects-xml 
Added projects.xml from Project Manager
 2014-10-29 09:22:09 +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
889d5122cc Merge pull request #871 from eightyeight/set-position 
Added a setPosition function
 2014-10-28 14:11:15 +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
a1b985e64d Merge pull request #869 from eightyeight/fix-tsfuncrefactor 
Fix omissions in astNodes.cpp
 2014-10-28 09:13:44 +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
Lukas Joergensen
40bdf19265 Merge pull request #3 from alphaslime/Ribbon-Implementation-Smallpatch 
Fixed a shader related crash and textured ribbon's material
 2014-10-21 07:03:31 +02:00
unkown
c527313284 Fixed a crash when ribbons are loaded 2014-10-20 21:09:41 -06:00
Daniel Buckmaster
0cb74186bc Added projects.xml from Project Manager 2014-10-20 11:41:12 +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
9706c4574b Merge remote-tracking branch 'jamesu/consoleargfix' into console-func-refactor 2014-10-20 08:44:12 +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
6b2f334d98 Merge pull request #820 from GarageGames/development-3.6 
Version 3.6.1
 2014-10-08 08:50:40 +11:00
Daniel Buckmaster
afef3268a7 Merge pull request #819 from GarageGames/development-3.6 
Version 3.6.1
 2014-10-08 08:50:33 +11:00
Daniel Buckmaster
5dfaa01e90 Merge pull request #817 from eightyeight/version-3.6.1 
Bump version to 3.6.1
 2014-10-06 14:57:24 +11:00
Daniel Buckmaster
b0c73fff55 Merge pull request #818 from eightyeight/fix-art 
Fixed Full template art a bit
 2014-10-06 14:56:52 +11:00
Daniel Buckmaster
06a4db295a Bump version to 3.6.1. 2014-10-06 14:51:39 +11:00
Daniel Buckmaster
a8d9f6c499 Fixed Full template art a bit. 
Player can now swim properly, and the physical zone elevator is a bit
more helpful (i.e. it sends you to the landing rather than leaving you
floating in midair). Fiddled some more with PostFX settings.
 2014-10-06 12:58:32 +11:00
Daniel Buckmaster
753d829675 Merge pull request #813 from eightyeight/fix-outpost-terrain 
Fixed minor issues with Outpost level
 2014-10-04 20:45:27 +10:00
Daniel Buckmaster
e5bc07010c Fixed minor issues with Outpost level. 
* Black spots caused by wrongly named images.
 * HDR settings tweaked to be a bit brighter.
 2014-10-04 20:30:27 +10:00
Daniel Buckmaster
b8b762805f Merge pull request #811 from LuisAntonRebollo/fix_opcode_x64 
Fixed OPCODE problems with x64.
 2014-10-04 20:16:36 +10:00
LuisAntonRebollo
46ffb3455b Fixed OPCODE problems with x64. 2014-10-04 11:20:43 +02:00
Daniel Buckmaster
c6e265d789 Merge pull request #808 from GarageGames/development 
Version 3.6
 2014-10-03 11:04:42 +10:00
Daniel Buckmaster
5103ba22e2 Merge pull request #807 from eightyeight/az_outpost 
Added Outpost testing level by Azaezel
 2014-10-03 09:34:30 +10: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
Areloch
099a91553a Merge pull request #723 from Azaezel/lightRay_Cleanup 
Light ray cleanup
 2014-10-01 22:34:23 -05:00
Daniel Buckmaster
599ad823b0 Added Outpost testing level by Azaezel. 2014-10-02 10:51:39 +10:00
Daniel Buckmaster
0a9b393e23 Merge pull request #775 from Azaezel/soldier_triggers 
player triggers.
 2014-10-02 10:22:34 +10: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