Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 16:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46250 commits 76 branches 59 tags 1.2 GiB
Commit graph

19006 commits

Author SHA1 Message Date
Ryan Huffman
1d2ea3be03 Fix transparent items not being rendered correctly against procedural skybox 2016-08-15 16:35:25 -07:00
Zach Pomerantz
af915c7923 replace cube tex DSA transfer with EXT 2016-08-15 15:31:04 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded 
Threaded rendering
 2016-08-15 09:59:44 -07:00
Ryan Huffman
b5e2913eb9 Move node received bandwidth tracking to LimitedNodeList 2016-08-15 09:23:02 -07:00
Brad Davis
fdbbd70eed Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug 
sidestep linux gcc linker? bug
 2016-08-13 12:08:05 -07:00
sam
87d61abe5a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-13 11:30:54 -07:00
Brad Davis
438205b875 Fixing last buffer flush 2016-08-12 22:29:05 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
d34ac2cea8 Fix hand laser alignment 2016-08-12 22:29:03 -07:00
Brad Davis
511eb34e5f Fixing mac build 2016-08-12 22:29:02 -07:00
Brad Davis
58c7df115f Reduce API surface area, make render batches const correct 2016-08-12 22:29:01 -07:00
Brad Davis
cac529a1b1 Display plugins now use gpu::Context API 2016-08-12 22:29:00 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
82081d7d57 Address vsync weirdness 2016-08-12 22:28:58 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00
Brad Davis
029721fd45 Restore screenshot 2016-08-12 22:28:53 -07:00
Bradley Austin Davis
f65b636a09 Re-disable HMD preview on OSX 2016-08-12 22:28:52 -07:00
Bradley Austin Davis
c303e1118a Only setup the debug logger once 2016-08-12 22:28:52 -07:00
Bradley Austin Davis
f1fd8ac6e4 Fix OSX Oculus issues 2016-08-12 22:28:51 -07:00
Brad Davis
d548da02d9 Expose whether nsight is running to the app, disable some stuff under nsight 2016-08-12 22:28:50 -07:00
Brad Davis
4795ddd014 Perf test improvments (skybox support) 2016-08-12 22:28:49 -07:00
Brad Davis
f776b10b58 Enable flag driven CPU generation of mipmaps 2016-08-12 22:28:49 -07:00
Brad Davis
7fb1315945 Properly track the max mip 2016-08-12 22:28:48 -07:00
Brad Davis
9ed1a5980a Prevent the allocation of 0 size buffers 2016-08-12 22:28:47 -07:00
Brad Davis
42dcae72cb Use ranges instead of stacks for nSight 2016-08-12 22:28:46 -07:00
Brad Davis
884ee1a68b Disable debug HMD plugin, ensure we release resources each frame 2016-08-12 22:28:45 -07:00
Brad Davis
c66ed3e009 Use weak pointers instead of references for deallocation safety 2016-08-12 22:28:44 -07:00
Brad Davis
5210dee155 Cleanup of GPU lib, breaking up Resource.h 2016-08-12 22:28:43 -07:00
Bradley Austin Davis
d2fd7f88fd Enabling OSX Oculus plugin 2016-08-12 22:28:43 -07:00
Brad Davis
b12332b517 Add preview window toggle, fix cursor in HMD 2016-08-12 22:28:42 -07:00
Brad Davis
f8690867d3 Allow plugins to query if a texture is ready to render 2016-08-12 22:28:41 -07:00
Brad Davis
f819e98d94 Fix menu so that functions indirectly triggered by menu scanning don't inherit the menu group 2016-08-12 22:28:40 -07:00
Brad Davis
479b9a9f2b Cleanup GL helpers and debug logging 2016-08-12 22:28:39 -07:00
Brad Davis
619158b6f2 Remove glfinish 2016-08-12 22:28:38 -07:00
Brad Davis
9cd1d69f1e Restoring preview and removing excessive GL state sync 2016-08-12 22:28:37 -07:00
Brad Davis
c6848a1b55 Remove static allocation debugger 2016-08-12 22:28:37 -07:00
Brad Davis
9f4fb0e8bd Stop messing about with the context, leave it bound on the render thread 2016-08-12 22:28:35 -07:00
Brad Davis
841d27ad20 Temporarily disable on-screen mirror and conform present batch to conventions 2016-08-12 22:28:34 -07:00
Brad Davis
0396694715 Fix initial state of view correction, plus overkill 2016-08-12 22:28:33 -07:00
Brad Davis
cbe1f6dbf5 Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD 2016-08-12 22:28:32 -07:00
Brad Davis
94fe2a8824 Fix GPU bug that could leave two uniform buffers with the same binding location 2016-08-12 22:28:32 -07:00
Brad Davis
29ff401506 Fix resizing of window in 2D mode 2016-08-12 22:28:31 -07:00
Brad Davis
d8b0fee934 Fixing color balance, enabling vive controllers 2016-08-12 22:28:30 -07:00
Brad Davis
901e2da828 Hand lasers 2016-08-12 22:28:29 -07:00
Brad Davis
b10e2020a7 Don't crash on plugin switch 2016-08-12 22:28:29 -07:00
Brad Davis
02b4873ab0 Use move constructor for building buffer shadow updates 2016-08-12 22:28:28 -07:00
Brad Davis
c2509e9492 Working on draw crash bug, adding render thread trash handling 2016-08-12 22:28:27 -07:00
Brad Davis
09ddad0fe0 HMD compositing and buffer debugging 2016-08-12 22:28:26 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Brad Davis
64ece05f40 Move compositing framebuffer to main GL plugin 2016-08-12 22:28:25 -07:00
Brad Davis
894d29bb29 Fixing flicking in instance based objects 2016-08-12 22:28:24 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
66cc9136eb Working on build 2016-08-12 22:18:48 -07:00
Bradley Austin Davis
cab1843eff Buffers on the render thread need special treatment 2016-08-12 22:18:40 -07:00
Bradley Austin Davis
13d7715c41 Prevent deadlock on changing plugins 2016-08-12 22:18:39 -07:00
Bradley Austin Davis
a0cc6f8817 Better buffer updating 2016-08-12 22:18:37 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
samcake
b90e0cfd89 Fixing the stereo issue 2016-08-12 19:18:05 -07:00
Anthony J. Thibault
1be434342b Work In Progress snapshot 
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
 2016-08-12 17:11:59 -07:00
Clément Brisset
5a1c7bd4e6 Merge pull request #8407 from highfidelity/steam 
Steam integration
 2016-08-12 16:55:48 -07:00
SamGondelman
ccca6d935f don't fade after physics kick in 2016-08-12 14:35:22 -07:00
howard-stearns
df3769166e Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master 2016-08-12 14:16:16 -07:00
Brad Davis
e2f7b443fd Merge pull request #8339 from sethalves/overlay-children 
3D Overlays can be children
 2016-08-12 12:16:21 -07:00
samcake
4fe67bfbf1 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-12 10:56:59 -07:00
Clément Brisset
7c698b8cbb Merge pull request #8423 from Atlante45/steam 
Update Steam branch
 2016-08-12 10:40:53 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Seth Alves
77a49e6c10 when building in debug mode on Linux, for reasons totally beyond me, this code ends up using the Vertex from FBXReader_Mesh.cpp (which is a different size so I get a crash). This change hopefully doesn't change any functionality while sidestepping what's probably a bug in gcc. 2016-08-12 10:01:20 -07:00
James B. Pollack
4c663b9d18 Merge pull request #8416 from SamGondelman/shaderFix 
Don't always mark procedural shaders dirty
 2016-08-11 22:49:46 -07:00
Ryan Huffman
211da3c428 Add more user activity tracking data 2016-08-11 16:49:29 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Ryan Huffman
473a7e9593 Fix bandwidth calculations not including the full size of reliable ordered messages 
For reliable ordered messages, we were:

 * only tracking bandwidth for the first few packets of a message
   IF a message handler opted in to receiving pending (unfinished)
   messages.
 * tracking the entire thing all at once, when the entire messages
   was received.
 2016-08-11 15:17:36 -07:00
Seth Alves
15e2140cb2 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-11 15:06:58 -07:00
Brad Hefta-Gaub
ea1e090053 Merge pull request #8383 from AndrewMeadows/faster-is-better 
faster image processing on load
 2016-08-11 13:10:44 -07:00
SamGondelman
0f988fb209 don't always mark _shaderDirty when user data changes unless url actually changes 2016-08-11 13:05:16 -07:00
Brad Davis
4c150efc11 Categorize some debug logging in FBX parsing 2016-08-11 12:09:56 -07:00
James B. Pollack
6da2ea1932 Merge pull request #8409 from SamGondelman/loadingFade 
Fix procedural entity transparency
 2016-08-11 12:02:57 -07:00
Atlante45
c34153b67b Change Web API arg name to be more descriptif 2016-08-11 11:57:43 -07:00
Anthony J. Thibault
1ddbd7022a Moved keyboardFocus, mouse/touch event methods from Reticle to Entities 2016-08-11 11:52:04 -07:00
David Kelly
5c15b52040 expose getPlaceName() as placename 
Nice for scripts to get the placename.  Nice for us, anyways.
 2016-08-10 14:54:29 -07:00
SamGondelman
d8545bc7a3 fix procedural transparency 2016-08-10 13:49:35 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
SamGondelman
e35d453b37 ...missing space 2016-08-10 10:36:37 -07:00
SamGondelman
9e20d92241 CR changes 2016-08-10 10:35:18 -07:00
Brad Hefta-Gaub
7503a495fd Merge pull request #8401 from ctrlaltdavid/21026 
Fix crash when adding new attachment
 2016-08-10 09:18:17 -07:00
Brad Hefta-Gaub
d736857ecb Merge pull request #8391 from AlexanderOtavka/qml-atp 
Add support for ATP protocol to QML
 2016-08-10 09:16:20 -07:00
David Rowe
afe76c69d2 Fix crash when adding new attachment 2016-08-10 10:41:16 +12:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
SamGondelman
5a4d15dd5b fix warning 2016-08-09 14:02:42 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -07:00
Brad Hefta-Gaub
d8f1847fde Merge pull request #8365 from huffman/feat/default-skybox 
Default skybox change
 2016-08-09 11:17:36 -07:00
Andrew Meadows
85d87fe13f Merge pull request #8218 from huffman/feat/load-improvements 
Speed up gamma correction in cube map processing
 2016-08-09 11:10:36 -07:00
Atlante45
25b60d0c62 CR feedback 2016-08-09 10:07:57 -07:00
Seth Alves
607c168493 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-09 09:01:55 -07:00
SamGondelman
ae9fb3768c CR notes 2016-08-08 17:45:25 -07:00
samcake
4d3dce449f Better maybe 2016-08-08 17:28:04 -07:00
Ryan Huffman
6854f9fda4 Remove stars shaders and renderable 2016-08-08 16:03:03 -07:00
Ryan Huffman
36744d72d6 Fix warning using init list for QVariantMap 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Ryan Huffman
43c1472b36 Move srgbToLinear lookup table to external cpp 2016-08-08 15:47:53 -07:00
Ryan Huffman
b800aa793d Fix gamma correction adjusting uchar to float when unnecessary 2016-08-08 15:45:05 -07:00
Atlante45
61d07cf952 Restore mateverse URL 2016-08-08 15:39:25 -07:00
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
2af32ca60e Only leave lobby if you were invited 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
6b861e680f More work on lobby creation/invites 2016-08-08 15:39:25 -07:00
Atlante45
af76e47629 Fix linux build 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
a13950752b Update steam location with discoverability 2016-08-08 15:39:25 -07:00
Atlante45
e5290076be First draft for Steam friends 2016-08-08 15:39:25 -07:00
Atlante45
0663766074 Replace metaverse server with testing URL 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
Zander Otavka
cb153f2a29 Fix file header comments 2016-08-08 15:17:42 -07:00
Zander Otavka
aebd18db7f Add EOF newlines 2016-08-08 15:12:17 -07:00
Zander Otavka
246a8457e1 Add some asserts 2016-08-08 15:12:17 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
SamGondelman
de900e85c0 remove duplicate include 2016-08-08 14:10:47 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
2ee511bae0 Fix syntax error 2016-08-08 12:30:11 -07:00
Ryan Huffman
28b3ff9bca Update generation of srgb to linear lookup to include python script 2016-08-08 12:04:06 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
sam
db8bf78dd1 Good state 2016-08-08 02:28:25 -07:00
sam
e6c74b29c7 WTF... 2016-08-07 19:48:23 -07:00
sam
b133556c14 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-07 18:55:44 -07:00
sam
d1105b8102 Still trying 2016-08-07 18:10:03 -07:00
Andrew Meadows
4e23ecfb2c count the _translucent_ pixels and fix break logic 2016-08-07 10:50:25 -07:00
Andrew Meadows
f759fd1033 early exit when determining if alpha mask possible 
also don't bother scanning for alpha for cube maps
 2016-08-07 08:54:20 -07:00
sam
e92e69d963 More changes 2016-08-06 11:54:54 -07:00
Andrew Meadows
4f2c00af46 faster TextureUsage::process2DImageColor() 2016-08-05 23:38:45 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -07:00
Brad Hefta-Gaub
452c0218da Merge pull request #8358 from AlexanderOtavka/inline-e-script 
Fix parsing of embedded entity scripts
 2016-08-05 16:46:02 -07:00
Brad Hefta-Gaub
3f3dda6356 Merge pull request #8360 from sethalves/no-accidental-fly 
don't accidently fly
 2016-08-05 16:45:48 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
Chris Collins
1e2d77a99b Merge pull request #8346 from sethalves/default-when-av-fails 
use default avatar when avatar-url is bogus
 2016-08-05 15:13:58 -07:00
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
f2ee57f2de light fade 2016-08-05 11:17:02 -07:00
Anthony J. Thibault
90a06f0d40 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-05 11:05:10 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
sam
e96fd92f32 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-05 09:28:45 -07:00
sam
92c0fa2e7a Testiung more variations 2016-08-05 09:26:48 -07:00
elisa-lj11
a9a8710689 Switched saving download/upload to temporary directory 2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
9833ba1987 No errors upon build 2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
0e79aa9dbe Added quazip for unzipping functions 2016-08-04 16:46:56 -07:00
elisa-lj11
f277a019bf FileScriptingInterface 
Created new .cpp and .h for the download and unzipping of a model
 2016-08-04 16:46:56 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
Seth Alves
a2441ca84c back out some uneeded chagnes 2016-08-04 14:09:12 -07:00
Seth Alves
981a8d76fa code review 2016-08-04 13:47:43 -07:00
Seth Alves
45c21ca523 make UNSET_VALUE still work while still returning and empty string value for undefined keys 2016-08-04 13:37:08 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
Seth Alves
aeadbda1e1 adjust ground-to-fly logic 2016-08-04 11:34:42 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
Seth Alves
4c258b9568 fix bug which caused getValue for a non-existent key to return the integer 2 2016-08-04 10:16:08 -07:00
Seth Alves
1b571f3be3 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-04 09:58:41 -07:00
Seth Alves
905c6147cf Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-04 09:56:32 -07:00
Seth Alves
e1c7ced652 increase GROUND_TO_AUTOFLY_THRESHOLD 2016-08-04 09:54:26 -07:00
Seth Alves
1930bde005 Merge branch 'master' of github.com:highfidelity/hifi into no-accidental-fly 2016-08-04 09:52:18 -07:00
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
Zander Otavka
a826f4eca1 Fix console errors for javascript: urls 2016-08-03 15:55:51 -07:00
samcake
b4e5b60656 fixing ao 2016-08-03 15:45:22 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Seth Alves
78e59106b4 adjust threshold for how far above the ground will cause the avatar to auto-fly 2016-08-03 15:21:49 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
Zander Otavka
f9b6db12e3 Fix parsing of embedded entity scripts 
Now correctly identifies when scripts are not urls as well as
javascript: urls.
 2016-08-03 13:48:27 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
Seth Alves
c743cf379e use loadCollisionModelURLFinished when collisions model is finished 2016-08-03 11:31:51 -07:00
Seth Alves
b48d4f6d2d Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-03 10:42:26 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00