Dave Parks
|
d9dfa9b870
|
SH-1777 Fix for "Prim" physics shape type not showing up on meshes with convex decompositions.
|
2011-06-08 14:31:22 -05:00 |
|
Dave Parks
|
d6730fddf6
|
don't use quota accounting manager
|
2011-06-08 00:16:02 -05:00 |
|
Xiaohong Bao
|
bdf34c2fbf
|
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
|
2011-06-07 18:24:04 -06:00 |
|
Xiaohong Bao
|
dfdf6aed23
|
fix for SH-1765: palm tree model fails to load in viewer
|
2011-06-07 18:22:09 -06:00 |
|
Dave Parks
|
f1784209d5
|
merge
|
2011-06-07 14:42:54 -05:00 |
|
Dave Parks
|
690f18c948
|
merge
|
2011-06-07 13:59:40 -05:00 |
|
Oz Linden
|
0de24f857a
|
pull back late fix from beta branch
|
2011-06-07 05:55:04 -04:00 |
|
Dave Parks
|
81af06c954
|
Fix for crash on clicking cancel while a model is still loading.
|
2011-06-07 00:22:49 -05:00 |
|
Dave Parks
|
b90bc83f3d
|
merge
|
2011-06-07 00:10:39 -05:00 |
|
Dave Parks
|
faf9693be3
|
Make basehull assert even more forgiving (only error out on 10% over bounds).
|
2011-06-07 00:10:24 -05:00 |
|
Xiaohong Bao
|
edeb1fcc2d
|
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
|
2011-06-06 23:05:24 -06:00 |
|
Xiaohong Bao
|
a3842d9637
|
fix for SH-588: Uploading a mesh crashes viewer
|
2011-06-06 23:04:48 -06:00 |
|
Dave Parks
|
d58c560e72
|
merge
|
2011-06-06 19:28:10 -05:00 |
|
Dave Parks
|
a58e70261e
|
SH-101 Fix for asset when uploading some models.
|
2011-06-06 19:27:47 -05:00 |
|
Dave Parks
|
5cfc4764db
|
merge
|
2011-06-06 19:13:08 -05:00 |
|
Dave Parks
|
b3fbb12f15
|
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
|
2011-06-06 19:12:52 -05:00 |
|
Dave Parks
|
c4b7728f0e
|
merge
|
2011-06-06 18:20:25 -05:00 |
|
Dave Parks
|
aa21ad59aa
|
Fix for crash when viewing asset with "NoGeometry"
|
2011-06-06 18:20:07 -05:00 |
|
Roxie Linden
|
86d6c3f196
|
automated merge
|
2011-06-06 15:36:24 -07:00 |
|
Roxie Linden
|
c24a5a3fb5
|
automated merge
|
2011-06-06 15:35:52 -07:00 |
|
Dave Parks
|
5f2f532aaa
|
merge
|
2011-06-06 17:05:31 -05:00 |
|
Dave Parks
|
9793f6c51d
|
Add "NoGeometry" identifier support to viewer.
|
2011-06-06 16:54:15 -05:00 |
|
Don Kjer
|
325c2b2169
|
Removed the old mesh asset upload pipeline. Fixed a problem with spamming MissingString MacLocale warnings. Reviewed by Dave
|
2011-06-06 21:27:29 +00:00 |
|
Oz Linden
|
4a8109476c
|
STORM-1618: re-enable deferred rendering on ATI Macs
|
2011-06-06 17:16:14 -04:00 |
|
Roxie Linden
|
73bbcfb07b
|
automated merge
|
2011-06-06 12:55:21 -07:00 |
|
Oz Linden
|
4f794dd47e
|
merge tags from beta branch
|
2011-06-06 12:02:44 -04:00 |
|
Debi King (Dessie)
|
18d210e9b0
|
reconciled .hgtags
|
2011-06-06 11:52:37 -04:00 |
|
Oz Linden
|
7a7c6860e5
|
increment development viewer version to 2.7.3
|
2011-06-06 08:50:53 -04:00 |
|
Oz Linden
|
02c85bd026
|
Added tag 2.7.2-start for changeset 9f79a6ed8fdc
|
2011-06-06 08:49:55 -04:00 |
|
Dave Parks
|
70f959f01e
|
SH-1738 Fix for broken UI text when deferred rendering enabled.
|
2011-06-06 02:41:09 -05:00 |
|
Oz Linden
|
6b5ad9f1ec
|
disable deferred rendering on ATI Macs until SH-1618 is solved
|
2011-06-04 21:07:56 -04:00 |
|
Oz Linden
|
fe7cd2ddb0
|
correct license headers
|
2011-06-04 08:03:12 -04:00 |
|
Oz Linden
|
268ea7bd45
|
fix DOS line endings
|
2011-06-04 08:00:15 -04:00 |
|
Oz Linden
|
2c9a914d7d
|
merge changes for storm-1318
|
2011-06-04 07:50:12 -04:00 |
|
Oz Linden
|
19250ff490
|
merge changes for storm-1312
|
2011-06-04 07:49:03 -04:00 |
|
Oz Linden
|
4e0d25720f
|
merge changes for storm-1316
|
2011-06-04 07:48:08 -04:00 |
|
eli_linden
|
f4204d105a
|
FIX VWR-20803
|
2011-06-03 17:06:41 -07:00 |
|
Debi King (Dessie)
|
db2d21a89b
|
reconciled .hgtags
|
2011-06-03 20:03:52 -04:00 |
|
eli_linden
|
6e2095b4f1
|
FIX VWR-20691
|
2011-06-03 17:00:26 -07:00 |
|
Don Kjer
|
c32b0122ab
|
Merge
|
2011-06-03 23:58:58 +00:00 |
|
eli_linden
|
39c4a4a955
|
FIX VWR-20689
|
2011-06-03 16:57:16 -07:00 |
|
Leslie Linden
|
7dbf6ebb74
|
Automated merge with file:///Users/Leslie/work/mesh-development
|
2011-06-03 16:52:04 -07:00 |
|
eli_linden
|
c55e9f3b6d
|
FIX VWR-20668
|
2011-06-03 16:48:17 -07:00 |
|
Debi King (Dessie)
|
eef9016ca1
|
Added tag DRTVWR-61_2.7.1-beta1, 2.7.1-beta1 for changeset 0c4d0c242780
|
2011-06-03 19:43:13 -04:00 |
|
Leslie Linden
|
ffab1eef57
|
Mac build fixes.
Reviewed by davep.
|
2011-06-03 16:24:07 -07:00 |
|
Roxie Linden
|
bc014c2e9e
|
automated merge
|
2011-06-03 14:34:00 -07:00 |
|
Don Kjer
|
357062a196
|
Added build params for mesh-asset-deprecation
|
2011-06-03 19:46:34 +00:00 |
|
callum
|
d034bdcae7
|
(EXP-871) FIX Add a WARNING to comment for BrowserEnableJSObject and set to no persist between sessions
|
2011-06-03 10:59:26 -07:00 |
|
Dave Parks
|
f4722b3905
|
merge
|
2011-06-03 00:15:56 -05:00 |
|
Dave Parks
|
b0a04b08f7
|
SH-1744 Add havok's degenerate triangle check to importer. Highlight degenerate triangles in physics mesh and block upload when degenerate triangles are present.
|
2011-06-03 00:13:50 -05:00 |