Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50632 commits 2 branches 0 tags 1.1 GiB
Commit graph

319 commits

Author SHA1 Message Date
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
Seth Alves
689fdfb35f implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame 2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958 implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame 2016-11-04 11:42:31 -07:00
Seth Alves
727fe4bc21 Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name 2016-11-04 10:04:56 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
Andrew Meadows
cd5826e2ce load model of new entity with unknown dimensions 2016-11-03 09:03:04 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
e4317adcf1 remove cruft 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
83426fd5a8 handle transitions to/from STATIC_MESH 
when rendering collision geometry
 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
eb65be5478 remove cruft argument from allocateModel() 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
191b7f0f39 variable namechange: Hull --> Mesh 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Andrew Meadows
499150bbed finish hook alert for new entity collision shape 2016-08-24 22:25:45 -07:00
Andrew Meadows
c3f165d9da BufferView::Iterator doesn't support operator< 2016-08-19 10:15:37 -07:00
Andrew Meadows
2ba35e6398 skip non-existant meshes 2016-08-18 11:48:56 -07:00
Andrew Meadows
cb9a5466d5 workaround bad FBXMesh data rather than assert 2016-08-18 11:09:48 -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
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -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
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
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00