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
James Urquhart
a46779fad6
Defer re-init'ing the shape when TSShapeConstructor is loading a shape
2016-09-03 10:41:25 +01:00
Duion
79c6a25050
multiplayer decals and art/core filepaths fixes
2015-12-27 00:39:52 +01:00
Daniel Buckmaster
84e8cbb4ee
Revert recent style cleanup changes.
2015-03-04 11:58:36 +11:00
Daniel Buckmaster
33ff180593
Merge branch 'development' into style-cleanup
...
Conflicts:
Engine/source/console/astNodes.cpp
Engine/source/console/codeBlock.cpp
Engine/source/console/compiledEval.cpp
Engine/source/ts/collada/colladaAppMesh.cpp
Engine/source/ts/tsShape.cpp
Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
bank
f3fc84738b
Use fixed buffer size var when allocating return buffer from console.
...
Conflicts:
Engine/source/T3D/missionArea.cpp
Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
bank
69dbaf5b85
Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape
2014-05-13 14:08:42 +04:00
bank
e2545c359c
Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSMesh
2014-05-13 12:43:01 +04:00
bank
733347fd61
Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct ImportOptions (ColladaUtils)
2014-05-12 19:23:25 +04:00
DavidWyand-GG
bfec2dfd79
Fix texture and object console paths
...
- Be sure to delete all prefs.cs files following this change.
- Changes the console types of the missing, unavailable and warning
texture paths. The old type was causing string corruption when saving
preferences.
- Changes the console type of the TSShapeConstructor collision shapes.
The old type was causing string corruption when saving preferences.
- Changed missing texture reference in ProcessedMaterial from String to
const char*.
2013-04-09 10:05:57 -04:00
DavidWyand-GG
4b1334db9f
Removed hard coded directory paths
...
- Removed references to core directory.
- Switch some references to tools directory
- Added preferences variables where appropriate
2013-03-07 18:56:53 -05:00
DavidWyand-GG
7dbfe6994d
Engine directory for ticket #1
2012-09-19 11:15:01 -04:00
