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 |
|
amantley
|
20fd893b47
|
Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp
|
2017-11-16 18:38:28 -08:00 |
|
amantley
|
ded81fcab0
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
Updating the branch to the latest code
|
2017-11-16 13:53:17 -08:00 |
|
amantley
|
881b22ab15
|
added update function to modelEntityItem.cpp
|
2017-11-16 12:41:56 -08:00 |
|
SamGondelman
|
3274c41aeb
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-15 17:45:45 -08:00 |
|
amantley
|
cc43d8115c
|
In response to bug in the original PR, in RenderModelEntityItem.cpp I made a change in the handling of the boundary cases for the first and last frame properties. Also deleted some extraneous comments.
|
2017-11-15 17:42:33 -08:00 |
|
SamGondelman
|
7eb22b372f
|
merge with master
|
2017-11-15 14:35:30 -08:00 |
|
SamGondelman
|
8730a26d20
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
|
2017-11-15 14:12:16 -08:00 |
|
Andrew Meadows
|
2f5b7f32c6
|
only add valid renderables to _renderablesToUpdate
|
2017-11-14 17:08:12 -08:00 |
|
Andrew Meadows
|
500f381827
|
collect hard-coded time budgets in one spot
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
ffe16a754e
|
another pass through the crucible
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
f67114a0a8
|
PrioritySortUtil::Prioritizer doesn't need to be a template
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
55cc945c78
|
organize PrioritySortUtil differently
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
111480f630
|
fix bad conflict resolution
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
e93c10b5ee
|
remove cruft
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
8707c76a6a
|
templatize the ViewFrustum-relative sort algorithm
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
f47185b2f6
|
remove tabs from indentation
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
c6bccb3de3
|
avoid adding null renderables to list
|
2017-11-14 15:57:17 -08:00 |
|
Andrew Meadows
|
809ff7928e
|
sort and throttle UpdateRenderables
|
2017-11-14 15:57:17 -08:00 |
|
SamGondelman
|
60db24f2d3
|
merge with master
|
2017-11-13 14:36:24 -08:00 |
|
SamGondelman
|
2fb1981c4a
|
merge with master
|
2017-11-13 14:34:39 -08:00 |
|
SamGondelman
|
2c0272f304
|
(mostly?) fix touch events
|
2017-11-13 12:58:31 -08:00 |
|
amantley
|
842cddde88
|
Deleted new members of RenderableModelEntity.h that were not necessary
to implement the loop,hold,play properties for an entity animationq
|
2017-11-13 12:00:32 -08:00 |
|
amantley
|
3f7a9e9703
|
all entity animation fixes including the animation play reset
|
2017-11-10 15:36:57 -08:00 |
|
amantley
|
1a06c6ef11
|
all entity animation fixes done except play animation
|
2017-11-10 15:23:17 -08:00 |
|
Olivier Prat
|
8b6a2eeb24
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-10 10:19:32 +01:00 |
|
amantley
|
3ce65ece87
|
Merge remote-tracking branch 'upstream/master' into character_entity_fixes
this is just to synch this branch with the upstream master
|
2017-11-09 10:38:34 -08:00 |
|
amantley
|
af0304fd6b
|
preliminary changes for the property fixes
|
2017-11-09 10:04:12 -08:00 |
|
Atlante45
|
8a903c8b12
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2017-11-07 14:26:25 -08:00 |
|
amantley
|
e13a74213c
|
this is holder spot to put avatar entity animation code
|
2017-11-06 17:29:19 -08:00 |
|
SamGondelman
|
7d420f5242
|
isLeftHand, isRightHand, isMouse
|
2017-11-06 12:29:21 -08:00 |
|
samcake
|
d878fac62c
|
REverse changes
|
2017-11-06 11:25:02 -08:00 |
|
Sam Gateau
|
45e5d91b9d
|
Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model
|
2017-11-04 20:49:55 -07:00 |
|
SamGondelman
|
55ac585cd9
|
Merge remote-tracking branch 'upstream/master' into ui
|
2017-11-03 17:32:13 -07:00 |
|
SamGondelman
|
ce58b6c401
|
trying to fix HUD events, abstracting touch event logic (wip), seth's comments
|
2017-11-03 17:15:30 -07:00 |
|
Olivier Prat
|
fbcb2924e8
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-03 15:08:15 +01:00 |
|