Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3
...
Case 20132, Case 16928: First class Image Entities
2018-12-20 21:20:49 +00:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3
2018-12-19 11:37:10 -08:00
SamGondelman
7231116e43
fix zone with invalid script not loading
2018-12-18 13:04:56 -08:00
SamGondelman
6aac596698
updated entityscriptinginterface API and related functions
2018-12-07 15:25:21 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
Seth Alves
6eb3fa251d
guard against null deref
2018-09-21 10:39:41 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
Seth Alves
d5c0c05ab2
wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded.
2018-09-21 10:26:55 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
Andrew Meadows
3c01433e12
stub for avatars changing workload regions
2018-08-23 12:59:28 -07:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
...
Safe landing client-side improvements
2018-08-20 20:36:17 -07:00
Simon Walton
3c665b7de8
Don't delete sequence numbers outside of range as range may change
2018-08-10 14:40:08 -07:00
SamGondelman
15070f6374
fixing fading
2018-08-10 10:52:58 -07:00
Thijs Wenker
003e826d60
move over definition so it could be linked in the assignment-client too
2018-08-01 00:23:34 +02:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures
...
Fix transparent textures rendering wrong sometimes
2018-06-21 14:23:49 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures
2018-06-15 15:09:32 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
...
Remove functionality for rendering collision models directly in the Model class
2018-06-15 14:46:40 -07:00
sabrina-shanman
b2ec7f78c1
Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer
2018-06-14 15:49:40 -07:00
SamGondelman
5ac7ced306
cleanup renderable model entity item, fix crash on reload, fix different transparent bug
2018-06-13 17:14:52 -07:00
Ryan Huffman
a558f71fcd
Fix resoruces path URLs not working with Script.resolvePath
...
Depending on the context, "/~/" means different things. The ScriptEngine
resolves this path to `/scripts`, but everywhere else it resolves to
`/resources`. This change forces us to expand those paths instead of
storing the "/~/" path, which will be incorrectly resolved once the
ScriptEnging is using it.
2018-06-12 16:55:31 -07:00
Andrew Meadows
c7c4324b3c
Merge 'master' into 'workload'
2018-05-15 10:22:50 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Clement
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
21213e81f4
Multiview support for priority queue
2018-05-01 18:03:21 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
samcake
a5ee211dbf
Dirty attempt to capture the owner typefor a payload
2018-04-05 18:04:35 -07:00
Andrew Meadows
4f0980b94b
hook up prototype PhysicsBoundary job
2018-04-05 12:11:57 -07:00
Sam Gateau
a2993c7cdb
First version wof space working with Transaction & Collection
2018-03-13 01:45:21 -07:00
Andrew Meadows
7a852a0e31
clear the Space
2018-03-01 12:11:30 -08:00
Andrew Meadows
67c78a2df1
remember list of stale proxies
2018-03-01 10:21:25 -08:00
samcake
33b47f9ae2
Merging with the actual worloadspace managed from the EntityTreeRenderer
2018-02-21 10:34:58 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
humbletim
513a69cdcd
changes per CR feedback
2018-01-03 04:08:43 -05:00
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
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -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
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05: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
Andrew Meadows
406bf7898d
cleanup prof stats and trace context names
2017-12-11 11:31:00 -08: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
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
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
samcake
9a9d13e519
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-21 09:05:46 -07:00
