Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41167 commits 29 branches 0 tags 1.1 GiB
Commit graph

16654 commits

Author SHA1 Message Date
Zach Pomerantz
f987da4c43 Move qml rendering to defined thread 2016-03-18 18:10:45 -07:00
samcake
f7847f6561 Trying to fix names 2016-03-18 17:32:00 -07:00
Ryan Huffman
b7678f9818 Remove accidental addition of whitespace 2016-03-18 16:33:00 -07:00
Ryan Huffman
c5c35b7e89 Add HandshakeRequest packet 2016-03-18 16:30:19 -07:00
Andrew Meadows
e81e49b32e prevent crash in SwingTwistConstraint 2016-03-18 15:59:25 -07:00
Anthony J. Thibault
960ffd9c9e DisplayPlugins: updateHeadPose() no longer returns a value. 
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
 2016-03-18 15:16:58 -07:00
howard-stearns
b9a3e130cb Safer early-bail for fetch of subresources of .obj models. 2016-03-18 15:02:30 -07:00
Brad Hefta-Gaub
2ef5b3727e Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash 2016-03-18 14:04:45 -07:00
Chris Collins
5e8c10508c Merge pull request #7392 from jherico/resource 
Make shared lists thread safe
 2016-03-18 13:25:58 -07:00
samcake
225b330d41 Trying to better load aand detect the case for transparent textures oor opacity mask 2016-03-18 12:47:33 -07:00
Anthony J. Thibault
d218ca4960 openvr: fix for crash on exit 
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin.  This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.

This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:

* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
 2016-03-18 12:26:11 -07:00
Brad Hefta-Gaub
925d5d36ac clean up the recalculateMeshBoxes() calls in findRayIntersectionAgainstSubMeshes() 2016-03-18 12:20:45 -07:00
Bradley Austin Davis
16e6d9a4f9 Make shared lists thread safe 2016-03-18 11:15:35 -07:00
Zach Pomerantz
a0ba5d3c29 Look at whole tex for alpha mask 2016-03-18 11:00:36 -07:00
Brad Hefta-Gaub
0474be59c9 remove invalid.com url 2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub
eb8a6527c6 change ModelBlender to use a set<WeakPointers> to safely handle model lifetime 2016-03-17 19:44:42 -07:00
Seth Alves
1e02c8d9d3 minimize diff 2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand 2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Zach Pomerantz
60f22c51b9 Check qml gl context on create 2016-03-17 16:56:23 -07:00
Brad Hefta-Gaub
a6ecfd789c Merge pull request #7381 from sethalves/fix-crashes-1 
fix FBXGeometry::convexHullContains crash
 2016-03-17 16:00:58 -07:00
Zach Pomerantz
b1e020d3fd Fix threadname typo 2016-03-17 15:56:57 -07:00
Brad Hefta-Gaub
edcf642410 Merge pull request #7374 from jherico/plugin_switch_crash 
Reduce crashes on switching display plugins
 2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
d5bf65cc8f Merge pull request #7379 from sethalves/fix-crashes-0 
possibly fix a couple of crashes
 2016-03-17 15:51:27 -07:00
Seth Alves
87dbec8974 add comment 2016-03-17 14:43:00 -07:00
Seth Alves
cea97aa317 fix FBXGeometry::convexHullContains crash 2016-03-17 10:55:24 -07:00
Seth Alves
db5c6d80d2 possibly fix a couple of crashes 2016-03-17 10:31:54 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Brad Hefta-Gaub
9d15c190f7 Merge pull request #7373 from howard-stearns/lazy-obj 
Lazy obj aux file reading
 2016-03-17 09:47:52 -07:00
Bradley Austin Davis
384351067e Don't crash when the Rift is turned off 2016-03-16 20:16:28 -07:00
samcake
1240f144d4 Merge pull request #7358 from zzmp/fix/px-dirty-atomic 
Make procedural dirty marker atomic
 2016-03-16 18:41:12 -07:00
Chris Collins
307a0cf05a Merge pull request #7349 from zzmp/fix/guard-skybox-tex 
Guard against failure to load skybox tex
 2016-03-16 15:06:52 -07:00
Howard Stearns
07214843e0 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-16 09:50:17 -07:00
Howard Stearns
e25c547cb7 whitespace 2016-03-16 09:50:05 -07:00
Clément Brisset
35aa074955 Merge pull request #7369 from birarda/udt-slow-start 
repairs to udt SendQueue packet timing
 2016-03-16 09:44:58 -07:00
Stephen Birarda
c94e2bdc8b grab the now timestamp only when needed 2016-03-16 08:53:31 -07:00
Brad Hefta-Gaub
d840e68f05 Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change 
Reregister and scale after model change
 2016-03-16 08:04:42 -07:00
Andrew Meadows
7acc56bf00 Merge pull request #7359 from zzmp/feat/bg-gpu-timer 
Add a DrawBackgroundDeferred gpu timer
 2016-03-16 07:58:53 -07:00
Howard Stearns
798a225573 Hack to suppress the attempted loading of .mtllib files if the url has a query part that includes "hifiusemat". 2016-03-15 21:11:54 -07:00
Howard Stearns
76b5b6aeeb clean 2016-03-15 20:31:57 -07:00
Zach Pomerantz
6f1079e0e0 Merge pull request #7372 from samcake/orange 
Fixing a bug when albedo map transparent is not quite loaded yet
 2016-03-15 19:47:02 -07:00
Howard Stearns
d1d8e6cb22 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-15 18:37:13 -07:00
Howard Stearns
c9f6b15ac5 checkpoint after lazy mtllib reading 2016-03-15 18:35:59 -07:00
howard-stearns
6161aab0c1 checkpoint 2016-03-15 17:05:01 -07:00
samcake
d58ac269ee Fixing a bug when albedo map transaprent but not quite loaded yet 2016-03-15 17:01:26 -07:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
samcake
f30e8e9e0c Merge pull request #7281 from zzmp/fix/png-opacity 
Fix materials to honor png texture opacity
 2016-03-15 16:08:36 -07:00
Brad Hefta-Gaub
870677a223 Merge pull request #7339 from samcake/red 
Less jittering at far distance
 2016-03-15 15:39:33 -07:00
Stephen Birarda
1cd16da83e do sleep timing off when next packet would have been 2016-03-15 15:28:55 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00
Brad Hefta-Gaub
5245b6f7be Merge pull request #7323 from howard-stearns/zone-visibility 
Zone visibility
 2016-03-15 13:44:40 -07:00
samcake
a779381230 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-15 13:06:07 -07:00
howard-stearns
1891062dd2 Merge branch 'master' of https://github.com/highfidelity/hifi into reregister-and-scale-after-model-change 2016-03-15 12:22:36 -07:00
howard-stearns
ddc658af5f After a modelURL change to an existing model, allow the model to be 
snapped and scaled to the existing entity registration and dimensions.
 2016-03-15 12:20:51 -07:00
Zach Pomerantz
1a8cca3dcc Clarify use of procedural's dirty atomic flag 2016-03-15 10:51:55 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
samcake
af24b5f1a3 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-15 10:23:06 -07:00
Clément Brisset
17e5b441cf Merge pull request #111 from huffman/atp-manager-name 
Add atp filename to entities added to world
 2016-03-15 10:19:53 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00
Howard Stearns
28f5ee16b8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 22:05:41 -07:00
Ryan Huffman
e54d5aa162 Merge pull request #7354 from birarda/udt-slow-start 
fix for UDT slow start phase with handshake changes
 2016-03-14 21:07:49 -07:00
Stephen Birarda
8cb602173a remove the unused member variable 2016-03-14 20:54:41 -07:00
Brad Hefta-Gaub
cf6a975a2b Merge pull request #7336 from ctrlaltdavid/text3d-tuning 
Improve text3d rendering
 2016-03-14 18:59:06 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Zach Pomerantz
5ab21588f2 Add gpu timer to background 2016-03-14 17:53:39 -07:00
Zach Pomerantz
ff07e47626 Make procedural dirty marker atomic 2016-03-14 17:52:13 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
Howard Stearns
d7e3699bc8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 17:45:52 -07:00
samcake
51be2a7107 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-14 17:33:56 -07:00
Anthony J. Thibault
16a57bda81 SwingTwistConstriant: fix for bad index. 2016-03-14 17:30:53 -07:00
Anthony Thibault
5623fc1b89 Merge pull request #7328 from AndrewMeadows/dynamic-constraints 
reduce clamping of animation underpose by IK system
 2016-03-14 16:47:00 -07:00
Ryan Huffman
7823882aa1 Add atp filename to entities added to world 2016-03-14 16:13:33 -07:00
Stephen Birarda
7858b6b0cd fix for slow start initial value with new randomization 2016-03-14 15:06:05 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Seth Alves
e8a03b725f try again on queryAACube 2016-03-14 13:03:27 -07:00
samcake
fbc19ec74f Back to the previous comuputation for the eye position in the hope to fix local lighting in stereo 2016-03-14 12:11:17 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Zach Pomerantz
b6322164cf Guard against failure to load skybox tex 2016-03-14 11:15:06 -07:00
samcake
a7f21d5fce Clena up comments, ready to PR 2016-03-14 10:36:19 -07:00
samcake
dc1f787873 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-14 10:11:46 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux 
Delete parentless entities redux
 2016-03-14 10:04:22 -07:00
Brad Hefta-Gaub
7f4cbeda00 Merge pull request #7343 from jherico/procedural_time 
Fix iDate uniform in procedurals to be continuous
 2016-03-13 22:08:54 -07:00
Anthony Thibault
54cc49283c libraries/avatars: cppcheck warning fixes 2016-03-13 18:19:42 -07:00
Anthony Thibault
9f30556084 libraries/animation: cppcheck fixes 
* Fix for potential bug in AnimLoop due to _maxFrameIndexHint being uninitialized.
* made more single argument constructors explicit.
 2016-03-13 17:17:34 -07:00
Anthony Thibault
11fcf00b2a AnimSkeleton.h: made single argument ctors explicit 2016-03-13 16:55:34 -07:00
Anthony Thibault
02b2281def AnimVarient.h: cppcheck fixes 
* make all constructors explicit.
* remove static string comparison in assert.
 2016-03-13 16:51:57 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
samcake
5b5d5cc328 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-12 17:33:57 -08:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
d868b541c4 Separate the request limit value from the active request value 
Use _requestLimit as the download limit, and track active downloads using
_requestsActive.  If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit.  If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
 2016-03-12 17:19:29 -08:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00
David Rowe
f7c6725f63 Improve text3d rendering 2016-03-12 23:24:52 +13:00
Brad Hefta-Gaub
c93ed7c6f7 Merge pull request #7321 from ctrlaltdavid/20829 
Restyle HMD menus
 2016-03-11 20:43:27 -08:00
samcake
84070052af Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-11 18:52:40 -08:00
samcake
3cf32b17be Trying to fix the jittering issue, foound an extra matrix inversion that could be the source 2016-03-11 18:52:02 -08:00
howard-stearns
8799bf2d55 Alternative implementation, which only selects visible bestZone. 2016-03-11 16:36:13 -08:00
Brad Hefta-Gaub
f9fca99b42 Merge pull request #7329 from howard-stearns/suppress-misleading-thread-warning 
Remove logging that implies a problem that isn't there.
 2016-03-11 16:34:46 -08:00
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
Seth Alves
5f05d576cc move checkAndAdjustQueryAACube into SpatiallyNestable 2016-03-11 15:55:42 -08:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Stephen Birarda
895920a211 short circuit upload when file cannot be opened 2016-03-11 15:19:41 -08:00
Zach Pomerantz
9dcdf26567 Only consider model transparent if all texs are 2016-03-11 15:15:30 -08:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Seth Alves
1e8706b1da remove debug print 2016-03-11 14:47:53 -08:00
Andrew Meadows
48efbba335 use dynamic constraints for IK 2016-03-11 14:47:48 -08:00
Andrew Meadows
c9f988d340 dynamic adjustment for twist 2016-03-11 14:47:47 -08:00
Andrew Meadows
4b75144797 remove debug cruft 2016-03-11 14:47:47 -08:00
Andrew Meadows
749dcf2c1d dynamic adjustment for swing 2016-03-11 14:47:47 -08:00
Andrew Meadows
6ebb94b1f4 minor API cleanup of SwingLimitFunction API 2016-03-11 14:47:47 -08:00
Andrew Meadows
df9ccf76ab fix animation-tests 2016-03-11 14:47:47 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
Zach Pomerantz
a89a76dc4b Require model fixup if tex is transparent 2016-03-11 14:33:19 -08:00
Zach Pomerantz
3b62e203f7 Cache NetworkGeometry::_hasTransparentTextures 2016-03-11 14:33:18 -08:00
Zach Pomerantz
22d41c833f Update loaded models with texture transparency 2016-03-11 14:27:36 -08:00
Zach Pomerantz
ee1fb698a4 Add texture transparency to material key 2016-03-11 14:27:35 -08:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
Anthony J. Thibault
0ce004c8a7 Removed passive-aggressive comment, (it was a late night) 2016-03-11 13:36:48 -08:00
Seth Alves
7a4dad8e51 allow entity-server to patch up broken queryAACubes 2016-03-11 13:20:52 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -08:00
Brad Hefta-Gaub
820e185c9d Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay 2016-03-11 11:49:43 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Brad Hefta-Gaub
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Stephen Birarda
85e203e2cb return an empty string for no error 2016-03-11 11:44:46 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c add file open and write error handling 2016-03-11 11:04:34 -08:00
howard-stearns
e538edba0a Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0 Respect zone visibility property. 2016-03-11 10:19:44 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d5c8e69c48 Merge pull request #7319 from samcake/red 
Supporting RenderItems being added Outside the RenderSpatialTree volume
 2016-03-11 08:34:50 -08:00
Seth Alves
510d96af0e Merge pull request #7316 from ZappoMan/toggleOverlay 
Repair Toggle Overlays
 2016-03-11 06:45:06 -08:00
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
Zach Pomerantz
2508b14126 Workaround for scribe not scrubbing #else 2016-03-10 22:53:21 -08:00
Zach Pomerantz
27884b26e9 Mark px shaders dirty on change 2016-03-10 22:53:07 -08:00
Zach Pomerantz
4dad797e20 Only add buffer/tex to skymap if asked for 2016-03-10 22:52:44 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Zach Pomerantz
4eca43027a Add texture, color to px skybox 2016-03-10 21:05:36 -08:00
Anthony J. Thibault
ab19d3e5a2 Moved animation after physics, hand poses are in world frame. 
There are still some debug hacks enabled so I can test in the vive room.
 2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
samcake
24d712b7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 18:14:22 -08:00
samcake
58b84b67ea Fixing the outside the octree bug 2016-03-10 18:14:11 -08:00
Brad Davis
87c9961aa8 Expose a property in display plugins to determine if the device is visble to the user 2016-03-10 17:19:32 -08:00
Stephen Birarda
6ae5ed6588 add trimming to MappingRequest ctors 2016-03-10 16:57:39 -08:00
Brad Hefta-Gaub
92c47fdc8b fix build buster, CR feedback 2016-03-10 16:44:59 -08:00
Brad Hefta-Gaub
387c156ce3 add failsafe for fade, so it can't endup between start and end property value 2016-03-10 16:24:30 -08:00
Howard Stearns
8a36df13df Merge pull request #7314 from samcake/color 
Fix a potentially bad access to RenderItem case from Overlay
 2016-03-10 16:19:56 -08:00
Brad Hefta-Gaub
9842689ec0 remove noise and return early 2016-03-10 16:19:52 -08:00
Brad Hefta-Gaub
0c12c6ef90 dont be an idiot 2016-03-10 16:14:56 -08:00
Brad Hefta-Gaub
ff30611234 first cut at getting overlays to toggle again 2016-03-10 16:07:49 -08:00
samcake
a88f22fa3c Removing white spaces 2016-03-10 15:58:04 -08:00
Brad Davis
bbc298f1e4 Merge pull request #7306 from zzmp/fix/px-rapid 
Allow procedural shaders to be reused, and prevent crashes from rapid updates
 2016-03-10 15:34:48 -08:00
Zach Pomerantz
505ae71e30 Pass px userData by const ref 2016-03-10 15:22:19 -08:00
samcake
fb68c09941 Before merging upstream 2016-03-10 15:10:34 -08:00
samcake
3944a7f297 Exposing thread safe number of allocated items for a ascene 2016-03-10 15:03:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
b3d8b67893 remove committed debug lines 2016-03-10 14:50:21 -08:00
Stephen Birarda
d077ade350 fix path regex to handle leading double slash 2016-03-10 14:48:44 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
samcake
f97c7b00de Removing old modifications 2016-03-10 14:06:07 -08:00
samcake
1e96c9e2ca Merging back with master 2016-03-10 14:03:37 -08:00
samcake
9fa1a4a478 Merging back with master 2016-03-10 14:01:58 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Anthony J. Thibault
9351d5edca Rig: warning fix & comments 2016-03-10 12:55:01 -08:00
Zach Pomerantz
d7d351fc63 Guard against unloaded env cubemaps 2016-03-10 12:50:52 -08:00
Zach Pomerantz
1e925d7bd8 Fetch unspecified textures on a delay 
This fixes an abort caused by the assertion
in ResourceCache::getResource: assert(delayLoad).
 2016-03-10 12:28:59 -08:00
Zach Pomerantz
d615e2e83b Avoid redundant zone updates 2016-03-10 12:27:45 -08:00
Stephen Birarda
e3cae5b026 change setMapping for new disconnected error case 2016-03-10 12:26:00 -08:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Zach Pomerantz
64042327ec Use version tmp var 2016-03-10 11:08:15 -08:00
Stephen Birarda
9c53f40fbe remove nullptr check in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
2bbeac6597 short circuit asset request for invalid hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
fccad7dca4 remove nullptr request checks in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Ryan Huffman
b42bec78dc Add Entities.addModelEntity 2016-03-10 10:25:20 -08:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead. 
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
 2016-03-10 10:20:17 -08:00
Zach Pomerantz
9b89e46e65 Make procedural userData thread-safe 2016-03-10 10:12:55 -08:00
Zach Pomerantz
1640314076 Use one procedural for skybox (avoid copies) 2016-03-10 10:12:22 -08:00
samcake
f40d390cc9 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 09:40:43 -08:00
samcake
a26f522f33 Merge pull request #7308 from jherico/shaders 
Fix link problem with shaders that use transparency and normal maps
 2016-03-10 09:35:35 -08:00
samcake
0543bb22e2 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 09:31:30 -08:00
samcake
f6276615f7 Trying to fix the bound out of the octree volume problem 2016-03-10 09:31:05 -08:00
Brad Hefta-Gaub
99d26e0ef5 Merge pull request #7310 from jherico/crashes 
Addressing thread safety issues
 2016-03-10 09:26:49 -08:00