Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Olivier Prat
93218da473
Fixed compilation errors on Mac and Linux
2017-07-13 17:51:16 +02:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
Olivier Prat
aba8be595e
Separated fade categories from transition event types
2017-07-11 11:37:24 +02:00
Olivier Prat
cc4e168369
Working fade again
2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c
Some objects fade and fixed crash due to invalid meta item id
2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a
First working fade
2017-07-10 15:27:09 +02:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Brad Davis
28d727153b
PR feedback
2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
howard-stearns
3d4f9be05b
fix teleport vs stuck-in-floor work
2017-06-12 17:01:13 -07:00
Howard Stearns
3d62900daf
When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.
2017-06-03 16:49:16 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Seth Alves
b99959c73d
munge collision-hull at last minute rather than store munged url as a property
2017-04-11 07:00:22 -07:00
Seth Alves
8a3a52cbcf
make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool
2017-04-10 13:54:24 -07:00
Seth Alves
6bd841857f
added a comment
2017-04-10 13:50:36 -07:00
Seth Alves
717436e0fd
use QUrl rather than just munging the url with a string-append
2017-04-10 10:54:30 -07:00
Seth Alves
554b23357c
add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls
2017-04-10 10:14:36 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Brad Davis
d89104f69c
Use getters instead of direct member access
2017-04-04 10:50:55 -07:00
Seth Alves
c21b8b4eac
raise max mesh count for static collision entities from 500 to 1000
2017-03-26 08:48:08 -07:00
Seth Alves
0d2e0eb9c3
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
...
Avoid deadlock on 10k mesh fbx
2017-03-24 12:34:37 -08:00
Seth Alves
aaa78d108b
if a model has too many meshes, give up.
2017-03-24 11:17:24 -07:00
Atlante45
4f8d9b190b
Show green box when model entity has bad url
2017-03-23 17:56:33 -07:00
ZappoMan
2a663cbcb1
cleanup
2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409
cleanup use of triangleSet for picking
2017-03-05 19:23:55 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Seth Alves
f0248275ec
Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui
2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2
load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.
2017-01-15 17:04:51 -08:00
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
