Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 14:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61953 commits 25 branches 0 tags 1.1 GiB
Commit graph

498 commits

Author SHA1 Message Date
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
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
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
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
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
2c0272f304 (mostly?) fix touch events 2017-11-13 12:58:31 -08:00
SamGondelman
7d420f5242 isLeftHand, isRightHand, isMouse 2017-11-06 12:29:21 -08:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
SamGondelman
657a0fb036 Merge remote-tracking branch 'upstream/pointers' into ui 2017-10-31 17:41:14 -07:00
SamGondelman
64665c87b2 replace ids with unsigned ints 2017-10-31 17:07:48 -07:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui 
Pointers generate PointerEvents (WIP)
 2017-10-31 10:01:15 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
samcake
b9112024b8 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-26 14:27:23 -07:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
SamGondelman
9bbb2eb692 austin's comments, send events directly to selected web entity 2017-10-23 10:17:45 -07:00
Sam Gateau
50a3ccdbca Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-21 10:01:07 -07:00
Sam Gateau
74b02a3e9b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-16 20:58:11 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
samcake
918e13b2fc fixing the zone entity not rendering when created or when avatar appears in one 2017-10-13 15:03:23 -07:00
samcake
8994200d01 Trying to integrate the tool scripts as an app 2017-10-12 17:57:30 -07:00
SamGondelman
cc8ecdc596 put back entity signals for scripts 2017-10-12 17:28:00 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
1a047613bf fix pointerevents on entities from scripts 2017-10-12 12:31:36 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00
SamGondelman
215193ad90 try to improve performance 
(cherry picked from commit a5f5f9fc5d)
 2017-10-04 13:50:35 -07:00
Andrew Meadows
46e809bbb2 use a better variable name 2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851 expose performance hot spot in stats details 2017-10-03 12:35:02 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
SamGondelman
be27376c52 add comment about bottleneck 2017-09-22 10:21:32 -07:00