4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
3f0a2cda29
Fix for sh-2443
2011-09-19 11:00:11 -04:00
1a7e166104
Fix for sh-2443
2011-09-16 15:10:58 -04:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
df40eca093
merge
2011-09-14 10:41:52 -04:00
4efca483d7
Fix for CTS-804. Added support for parsing translations from Blenders(v2.5.9) transform SID's.
2011-09-14 10:41:26 -04:00
f74b7274d2
SH-2400 FIXED crash on model upload.
...
Added checks for LoD strings array index bounds.
2011-09-13 19:45:04 +03:00
b56e4cf0e4
BUILDFIX GCC fixing unused variable
2011-09-12 14:51:22 -04:00
66aabf8a4f
merge
2011-09-08 15:55:17 -04:00
2e652ce660
Fix for SH-2210
2011-09-08 15:54:52 -04:00
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
f44b44400b
SH-2309 FIXED 'Triangles limit' combo value updating problem.
...
Fixed updating 'Error threshold' spinner control visibility.
2011-09-08 18:47:37 +03:00
955bcbb951
Merge mesh-development with sh-2309
2011-09-07 18:46:51 +03:00
bb085a45db
Merge from seth_mesh_dev to paul_mesh_dev
2011-09-07 16:15:54 +03:00
08c0de785f
merge
2011-09-06 09:42:11 -04:00
117bd5af1b
SH-2309 FIXED Priority modifications to mesh uploader UI
...
- Replaced magic number with constant
- Commented my magic numbers
2011-09-06 16:23:53 +03:00
028c34e0ff
SH-2309 Model preview floater LoD tab updated.
...
- Combo boxes for LoD source added for each level
- New option "Use LoD above" added for copying the model from higher LoDs.
- Various LoD settings and related controls removed.
2011-09-02 17:36:54 +03:00
5da2d4c853
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Changed representation of Retain% control values
- Added "Choose one..." item to the LOD combo_box
2011-09-02 17:14:07 +03:00
004de653aa
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Bind "Cosine%" param with "Smooth" combo box.
- Corrected some wording.
- Little UI polish. Line with results in Physics tab.
- Changed ordering of LOD combo box items.
2011-09-01 19:01:46 +03:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
55c2207792
SH-2309 WIP Priority modifications to mesh uploader UI
...
Made next changes according to the last version of UI spec:
- Modified Upload Options tab
- Modified Physics tab
- Modified the floater overall
2011-08-31 17:02:15 +03:00
5e5869c63a
Fix for Sh-2350
2011-08-30 14:59:52 -04:00
71ac45a28b
Handling of material mismatches - lod materials are required to be a subset of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts
2011-08-30 09:32:16 -04:00
124e4d5874
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Updated upload floater according to the UI spec
- Updated Modifiers panel according to the UI spec
2011-08-25 21:33:10 +03:00
716d2bd2e4
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Arranged all controls of the floater (according to the last version of the mockup) except for the tab container content.
2011-08-24 14:57:19 +03:00
27332685e9
Merge
2011-08-19 02:20:07 +03:00
1b36b04251
SH-1180 Log which nodes are problematic when loading a .dae with mirrored meshes and report error.
2011-08-18 14:41:34 -05:00
e0bf0e3e21
SH-2217 Fix for large models not getting properly clampled by importer (odd that server seems to need 240m limit instead of 256m limit)
2011-08-17 14:59:22 -05:00
1d4ccaeb74
SH-2285 FIXED Add localization capability to mesh uploader strings
...
- Added the convex decomposition strings to the strings.xml
- Added names to hardcoded strings.
2011-08-17 16:29:20 +03:00
8a84ec93fc
Merge
2011-08-16 14:51:37 +03:00
0301feb80b
SH-2029 FIX - fix for mac build error, hopefully
2011-08-15 18:54:35 -04:00
2d24203e59
SH-2029 FIX - persist the model name in SLM
2011-08-15 16:59:46 -04:00
fecec49081
Merge
2011-08-15 20:35:39 +03:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
6b70273603
Added support for parsing of collada 1.4.1 location sids
2011-08-11 13:19:58 -04:00
6732f5fbca
merge viewer-development to mesh-development
2011-08-10 17:53:11 -04:00
b2da13f46b
Joint resolver now constructed from key name (cts-660)
2011-08-10 12:27:29 -04:00
350894fc0b
SH-2064 FIXED 'Upload' button disabled while mesh upload is in progress.
2011-08-11 02:00:56 +03:00
0405e91df3
Reports error of a non compatible dae to the log if not 1.4
2011-08-09 17:10:17 -04:00
e384ccb5da
Temporarily disallow the upload of non 1.4 dae files
2011-08-09 16:31:36 -04:00
7633b3f1f1
SH-2201 Fix for crash when getting mesh estimates.
2011-08-04 23:42:41 -05:00
9d44be1903
merging in PE's fixes for new UI to mesh-development.
...
Included are upload floater tweaks, build panel tweaks,
and removing the mesh enabled checkbox in region tools.
2011-07-29 15:56:51 -04:00
ea3d58b314
SH-1868 FIXED Rearranged the accounting info to leave enough room for the upload permissions warning.
...
Removed hiding the accounting info when warning is displayed.
2011-07-27 21:20:04 +03:00
715d9f20a7
SH-1086 Make physics shape display transparent and fix some z-fighting issues.
2011-07-26 18:01:31 -05:00
9395bcee52
Fix for sh-2162
2011-07-25 17:42:22 -04:00
4a04458ff5
Partial fix for sh-1925.
2011-07-25 10:45:05 -04:00
50b9c63382
SH-1868 WIP Added user-supplied metric data for uploading a model.
...
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-22 22:40:18 +03:00
f45eb335df
SH-715 Fix for bad "cancel" behavior in physics tab.
2011-07-20 17:12:49 -05:00
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
Dave Parks