Seth Alves
|
4bbce011a4
|
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3
avatar-entities which are children of an avatar will scale with the avatar
|
2017-12-29 09:12:17 -08:00 |
|
Brad Hefta-Gaub
|
3d02955c5d
|
Merge pull request #12029 from SamGondelman/webOverlay
Fix >20 web entities crash
|
2017-12-24 17:10:39 -08:00 |
|
John Conklin II
|
0dd5bbc2d6
|
Merge pull request #12057 from birarda/61-1-merge-back
Merge stable back into master after RC61.1
|
2017-12-22 16:26:08 -08:00 |
|
Stephen Birarda
|
e3cbfd92a0
|
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
|
2017-12-22 15:48:04 -08:00 |
|
Seth Alves
|
96197e66bb
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 15:13:02 -08:00 |
|
Sam Gateau
|
db4f9909c7
|
Merge pull request #12017 from Zvork/glcolor
Removed glColor reset hack in MeshPartPayload
|
2017-12-22 14:25:51 -08:00 |
|
Sam Gateau
|
a2c16ddf6a
|
Merge pull request #12026 from SamGondelman/burp3
Remove _model from ModelMeshPartPayload
|
2017-12-22 13:50:06 -08:00 |
|
Seth Alves
|
897b96d092
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 07:36:26 -08:00 |
|
Stephen Birarda
|
7bf0cc2f63
|
cleanup other ref returns of shared pointers from sortables
|
2017-12-21 15:39:14 -08:00 |
|
SamGondelman
|
7a7b1f7089
|
fix web entity crash
|
2017-12-20 13:58:58 -08:00 |
|
SamGondelman
|
bd06dc6443
|
cleaning up modelmeshpartpayload
|
2017-12-20 11:00:14 -08:00 |
|
Zach Fox
|
297a3df63c
|
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
QML Whitelisting + Commerce Integration
|
2017-12-19 18:07:14 -08:00 |
|
Andrew Meadows
|
bad2c1df76
|
proper modulus of animation frame
|
2017-12-19 10:40:17 -08:00 |
|
Andrew Meadows
|
559cb33563
|
remove incorrect comment
|
2017-12-19 10:40:17 -08:00 |
|
Andrew Meadows
|
661a63bd0c
|
fix crash for bad QVector index
|
2017-12-19 10:40:17 -08:00 |
|
Olivier Prat
|
bd666406f4
|
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
|
2017-12-19 14:17:17 +01:00 |
|
Brad Davis
|
9f7b6f543d
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-12-18 11:17:07 -08:00 |
|
Andrew Meadows
|
cfd2097f36
|
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
Cleanup names of debug stats and trace contexts.
|
2017-12-18 10:02:42 -08:00 |
|
amantley
|
2817eadb7a
|
iMerge remote-tracking branch 'origin/character_entity_fixes' into character_entity_fixes
updating branch with remote
|
2017-12-13 16:48:33 -08:00 |
|
amantley
|
7c29a1b09a
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating branch to master
|
2017-12-13 16:47:15 -08:00 |
|
Zach Fox
|
3764445272
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-13 14:12:08 -08:00 |
|
amantley
|
29538851b6
|
Made the changes from the latest code review, except getting rid of the
while loop.
|
2017-12-12 09:06:43 -08:00 |
|
Andrew Meadows
|
406bf7898d
|
cleanup prof stats and trace context names
|
2017-12-11 11:31:00 -08:00 |
|
amantley
|
65bb896450
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
|
2017-12-11 10:55:54 -08:00 |
|
Seth Alves
|
2cd64ccd2c
|
merge from upstream
|
2017-12-11 10:14:30 -08:00 |
|
Zach Fox
|
b81cdf49ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-11 09:52:32 -08:00 |
|
amantley
|
7e49ce26d7
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating branch to the master
|
2017-12-11 08:02:33 -08:00 |
|
Olivier Prat
|
a679dc6705
|
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
|
2017-12-11 08:48:48 +01:00 |
|
Zach Fox
|
b2bafed2bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-07 11:21:24 -08:00 |
|
Ryan Huffman
|
f3fc5769e8
|
Move asset baking on asset server to separate process
|
2017-12-06 11:49:19 -08:00 |
|
Olivier Prat
|
1d8d8335c5
|
Moved shadow cascade distances computation to shadow, not shadow task
|
2017-12-06 10:05:39 +01:00 |
|
Olivier Prat
|
0b6dcb2717
|
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
|
2017-12-05 09:18:26 +01:00 |
|
Seth Alves
|
b590cd5b89
|
avatar-entities which are children of an avatar will scale with the avatar
|
2017-12-02 09:31:43 -08:00 |
|
ZappoMan
|
750d505f9b
|
fix issues in model import sizing caused by recent refactor
|
2017-11-30 17:51:59 -08:00 |
|
amantley
|
233d693d76
|
removed debug print statements and fixed negative FPS handling
|
2017-11-29 10:51:04 -08:00 |
|
amantley
|
778d98f56b
|
made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function
|
2017-11-28 18:42:03 -08:00 |
|
amantley
|
101e67498a
|
cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property
|
2017-11-28 14:11:56 -08:00 |
|
amantley
|
d607ca0914
|
initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server
|
2017-11-28 11:04:48 -08:00 |
|
amantley
|
522dc3dfb1
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating Character entity fixes branch with the changes in the origin
master
|
2017-11-22 17:55:39 -08:00 |
|
amantley
|
2e75016021
|
changes to modelEntity.cpp
|
2017-11-22 17:53:21 -08:00 |
|
amantley
|
fdf5139a74
|
everything now works with an atomic start time property. but now I will get rid of this and use current frame instead
|
2017-11-22 17:52:13 -08:00 |
|
amantley
|
1e5d099b06
|
changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp
|
2017-11-21 17:36:01 -08:00 |
|
samcake
|
84ff40c717
|
Merging with master
|
2017-11-21 14:12:47 -08:00 |
|
amantley
|
5a1d04ee06
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating the branch with the current master
|
2017-11-20 10:22:46 -08:00 |
|
Dante Ruiz
|
76935c1457
|
fixing merge conflict
|
2017-11-20 09:51:10 -08:00 |
|
amantley
|
befa0f8ab5
|
now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp
|
2017-11-20 09:11:15 -08:00 |
|
ZappoMan
|
3b77f14f69
|
fix build error
|
2017-11-19 15:12:23 -08:00 |
|
ZappoMan
|
04ee1adabd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-19 14:40:31 -08:00 |
|
Brad Hefta-Gaub
|
33d35bbe14
|
Merge pull request #11770 from AndrewMeadows/sort-and-throttle
sort and throttle UpdateRenderables work... when necessary
|
2017-11-19 11:09:08 -08:00 |
|
amantley
|
013d16cee9
|
this is the change to add a property for the currentframeplaying
|
2017-11-17 18:37:54 -08:00 |
|