Commit graph

7 commits

Author SHA1 Message Date
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Robert Fritzen 171a24459f Remove namespace from header
Removing the "using namespace Torque" from header file to prevent issues
with certain engine addons conflicting with ::UUID defined by windows
and Torque::UUID defined by T3D.
2013-07-28 12:55:52 -05:00
SilentMike 17c750b19a Merge pull request #243 from thecelloman/updatesquish
Update squish
2013-03-10 11:36:02 -07:00
thecelloman 4fdfb47f41 Updating libpng to v1.5.14 and zlib to v1.2.7
Since libpng has a dependency upon zlib, both updates were combined for one commit/pull-request.
2013-03-09 16:19:11 -05:00
thecelloman 8de0b7cbb1 Update squish library to 1.11 2013-03-04 14:37:50 -05:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00