Commit graph

3499 commits

Author SHA1 Message Date
David Wyand
6f56dcf846 Merge pull request #171 from DavidWyand-GG/issue170-AssetLoadLinux
Fix for Issue #170 Asset loading under Linux
2012-12-12 12:52:13 -08:00
DavidWyand-GG
5dd5814a9b Fix for Issue #170 Asset loading under Linux 2012-12-12 13:53:32 -05:00
David Wyand
37f44a6341 Merge pull request #167 from DavidWyand-GG/issue166-ClientNotLoading
Fix for Issue #166 for Client Not Loading
2012-12-10 13:30:46 -08:00
DavidWyand-GG
0598b6ae62 Fix for Issue #166 for Client Not Loading
The issue was with sending the ack mask to the client when the ack byte
count was 4.
2012-12-10 16:28:54 -05:00
David Wyand
a98dfb9218 Merge pull request #158 from DavidWyand-GG/issue124-RevertMaterialChanges
Partial revert of changes from Pull #125
2012-11-26 08:39:03 -08:00
DavidWyand-GG
4a11d54609 Partial revert of changes from Pull #125
Pull Request #125 was to fix Issue #124.  However, as reported by a
user, this fix broke the water.  This is a partial reversion of those
changes to get the water working again.  The fix from Pull #125 will
need to be examined.
2012-11-26 11:37:55 -05:00
David Wyand
70b95d6d49 Merge pull request #156 from DavidWyand-GG/issue155-BillboardCreation
Fix for Issue #155 for Billboard Creation
2012-11-26 08:05:31 -08:00
DavidWyand-GG
595119590d Fix for Issue #155 for Billboard Creation 2012-11-26 11:03:42 -05:00
David Wyand
f9cb217132 Merge pull request #153 from DavidWyand-GG/issue152-UnmatchedBitstream
Fix for Issue #152 for Unmatch Bitstream
2012-11-23 10:14:17 -08:00
DavidWyand-GG
a2466bfd3a Fix for Issue #152 for Unmatch Bitstream
This corrects for changes made in Pull Request #112.
2012-11-23 13:00:12 -05:00
David Wyand
7368dc2489 Merge pull request #151 from DavidWyand-GG/gitignore-ProjectManager
New gitignore for Project Manager
2012-11-23 07:50:12 -08:00
DavidWyand-GG
e5b64aa044 New gitignore for Project Manager 2012-11-23 10:48:40 -05:00
Daniel Buckmaster
46f140710a Prevented looking up incorrect object handles.
Previously, dAtoi would be called on arbitrary strings delimited
only by the / character. Now, Sim::findObject actually checks that
object handles (strings starting with a digit) actually only contain
digits or slashes.
2012-11-20 08:18:14 +11:00
Daniel Buckmaster
a1740e8a9c Made Trigger friendlier towards inheritance.
Specifically:
 * Made update bits constants protected so that derived classes can
   use them - especially NextFreeMask! IIRC, most classes make these
   constants public, though there's no real reason to.
 * Made potentialEnterObject virtual so that derived classes can
   substitute their own logic.
2012-11-18 21:32:51 +11:00
DavidWyand-GG
fa1a0124a9 Merge branch 'healthtexthud' of https://github.com/T3DCE/CE-OSLab into T3DCE-healthtexthud 2012-11-15 11:04:09 -05:00
David Wyand
9c343d1364 Merge pull request #142 from DavidWyand-GG/issue141-RemoveToolbox
Work for Issue #141 for Remove Toolbox
2012-11-13 15:41:59 -08:00
DavidWyand-GG
e65d404171 Work for Issue #141 for Remove Toolbox
Removed the old Toolbox and the Qt libraries, as well as all of the
Templates' game binaries.
2012-11-13 18:40:01 -05:00
Daniel Buckmaster
093252ada3 Updated logic in MissionArea::getServerObject.
Before this function would iterate through every server-side object to
find a MissionArea. Now, it stores the server object in a static member
smServerObject. This member is updated in onAdd and onRemove, and returned
by getServerObject.
2012-11-14 09:25:38 +11:00
Daniel Buckmaster
027d5608bd Added comment. 2012-11-13 10:21:03 +11:00
Daniel Buckmaster
74bd05030d Consider zoom when culling billboards.
screenScale represents the current zoom factor, but may need some
revision because I'm not sure if what it's doing is technically correct.
It is used to multiply the culling distance for cells, as well as the
fading distance.
2012-11-13 09:13:49 +11:00
jamesu
98b92360f9 Signed values now set/get from the float value. Also add a bool helper. 2012-11-09 23:00:46 +00:00
DavidWyand-GG
88cc4129af Reformatted code for Pull Request #71
Tabs were used instead of spaces.  Also added comments.
2012-11-09 15:17:49 -05:00
DavidWyand-GG
df01dd88fe Merge branch 'BitVector_copy_constructor' of https://github.com/Luis-Anton/Torque3D into Luis-Anton-BitVector_copy_constructor 2012-11-09 13:29:33 -05:00
DavidWyand-GG
9ebc6ecf0d Merge branch 'development' of https://github.com/BoomBox/Torque3D into BoomBox-development 2012-11-09 10:56:38 -05:00
David Wyand
b465cae165 Merge pull request #139 from DavidWyand-GG/issue138-GuiArrayCtrlFix
Fix for Issue #138 for guiArrayCtrl Fix
2012-11-08 15:35:39 -08:00
DavidWyand-GG
2a6a177fa1 Fix for Issue #138 for guiArrayCtrl Fix 2012-11-08 18:34:24 -05:00
David Wyand
1af290bd3b Merge pull request #137 from DavidWyand-GG/issue136-ZoningBug
Fix for Issue #136 for Zoning Bug
2012-11-08 15:20:51 -08:00
DavidWyand-GG
cfb90f37e4 Fix for Issue #136 for Zoning Bug 2012-11-08 18:19:33 -05:00
David Wyand
e2f0404a05 Merge pull request #135 from DavidWyand-GG/issue134-VS2010RCFiles
Fix for Issue #134 for VS2010 RC Files
2012-11-08 15:05:01 -08:00
DavidWyand-GG
20892395c1 Fix for Issue #134 for VS2010 RC Files 2012-11-08 18:03:40 -05:00
David Wyand
34db24a3e8 Merge pull request #133 from DavidWyand-GG/issue132-RenderOcclusionMgrRendering
Fix for Issue #132 for RenderOcclusionMgr Rendering
2012-11-08 14:49:55 -08:00
DavidWyand-GG
6637948067 Fix for Issue #132 for RenderOcclusionMgr Rendering 2012-11-08 17:47:32 -05:00
David Wyand
74cbcb3e85 Merge pull request #131 from DavidWyand-GG/issue130-DecalSmoothingGroups
Fix for Issue #130 for Decals and Smoothing Groups
2012-11-08 13:58:11 -08:00
DavidWyand-GG
a803398eb0 Fix for Issue #130 for Decals and Smoothing Groups 2012-11-08 16:56:22 -05:00
David Wyand
9a76293991 Merge pull request #129 from DavidWyand-GG/issue128-SoldierFPShadow
Fix for Issue #128 for Player First Person Shadow
2012-11-08 13:38:26 -08:00
DavidWyand-GG
88bb577c82 Fix for Issue #128 for Player First Person Shadow
IMPROVEMENT: By default we stop rendering all Player shadows when in
first person and 'renderFirstPerson' is disabled.  Added flag
'firstPersonShadows' to disable this behavior.
2012-11-08 16:37:11 -05:00
David Wyand
4290c1d985 Merge pull request #127 from DavidWyand-GG/issue126-TCPObjectBadConnect
Fix for Issue #126 for TCPObject Bad Connect
2012-11-08 13:19:14 -08:00
DavidWyand-GG
e9b1ec5876 Fix for Issue #126 for TCPObject Bad Connect 2012-11-08 16:18:06 -05:00
David Wyand
2291451b8e Merge pull request #125 from DavidWyand-GG/issue124-CustomMaterialRefraction
Fix for Issue #124 for CustomMaterial Refraction
2012-11-08 13:04:24 -08:00
DavidWyand-GG
0047842b33 Fix for Issue #124 for CustomMaterial Refraction 2012-11-08 16:00:52 -05:00
David Wyand
aa3a6d52ff Merge pull request #123 from DavidWyand-GG/issue122-MaterialSounds
Fix for Issue #122 for Material Sounds
2012-11-08 12:01:02 -08:00
DavidWyand-GG
dc25f17a69 Fix for Issue #122 for Material Sounds 2012-11-08 14:59:22 -05:00
David Wyand
a6d86a13c6 Merge pull request #121 from DavidWyand-GG/issue120-InvertedArrayObjectSort
Fix for Issue #120 for Inverted ArrayObject Sort
2012-11-07 16:47:18 -08:00
DavidWyand-GG
deba1b3728 Fix for Issue #120 for Inverted ArrayObject Sort 2012-11-07 19:45:40 -05:00
David Wyand
cd8bca48d5 Merge pull request #119 from DavidWyand-GG/issue118-ColladaMaterials
Fix for Issue #118 for Collada Importer Materials
2012-11-07 16:11:10 -08:00
DavidWyand-GG
05b3a32e2c Fix for Issue #118 for Collada Importer Materials 2012-11-07 19:09:51 -05:00
David Wyand
5f4edf8d78 Merge pull request #117 from DavidWyand-GG/issue116-CrashWithUnicode
Fix for Issue #116 for Crash with unicode
2012-11-05 16:21:39 -08:00
DavidWyand-GG
b085a76e50 Fix for Issue #116 for Crash with unicode 2012-11-05 19:16:25 -05:00
David Wyand
942b1c39c1 Merge pull request #115 from DavidWyand-GG/issue114-FootStepSounds
Fix for Issue #114 for Footstep Sounds
2012-11-05 16:06:01 -08:00
DavidWyand-GG
d6b85a21bb Fix for Issue #114 for Footstep Sounds 2012-11-05 19:04:49 -05:00