Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07: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
SamGondelman
8f411ad6c8
CR
2018-06-20 16:13:10 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07:00
SamGondelman
7771661948
fix particle spread properties
2018-06-15 17:35:49 -07:00
SamGondelman
9ea65950d5
particles: threadsafe, cleanup, rework initialized logic
2018-06-15 15:45:06 -07:00
SamGondelman
0b79e9f6c7
whoops
2018-06-15 15:13:29 -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
sabrina-shanman
4c39d08358
Remove "Draw Collision Shapes" option from developer physics menu
2018-06-11 11:03:57 -07:00
sabrina-shanman
440c77905a
Remove functionality for rendering collision meshes directly in the Model class
2018-06-11 11:03:57 -07:00
Brad Davis
380137a660
Fix particle entity shader
2018-06-10 12:15:00 -07:00
SamGondelman
c18602d22e
fix models starting as green boxes
2018-06-07 13:03:56 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
SamGondelman
86ee5c12d8
merge and update based on sam's changes
2018-05-31 17:53:36 -07:00
samcake
386c0f9ab2
Re review adjustments
2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
2018-05-30 23:31:54 -07:00
samcake
2e9076c71e
Clean up and trying to get ready for merge
2018-05-30 11:14:49 -07:00
Sam Gateau
678effdb48
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
2018-05-26 23:28:59 -07:00
SamGondelman
e6741a363e
add local-only isVisibleInSecondaryCamera flag to entities
2018-05-23 16:35:21 -07:00
Andrew Meadows
a23126a6b2
Merge 'master' into 'workload'
2018-05-18 07:38:02 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable
...
RC67.1 stable mergeback to master
2018-05-15 14:01:06 -07:00
Andrew Meadows
c7c4324b3c
Merge 'master' into 'workload'
2018-05-15 10:22:50 -07:00
SamGondelman
de4a2ca3b2
update procedural skybox on user data change
2018-05-10 18:44:53 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
32086def18
Merge pull request #13091 from samcake/blue
...
Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-04 10:25:57 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
samcake
767e6b15f3
Fixing the local lighting on translucents bug
2018-05-03 11:42:06 -07:00
samcake
60a49c3f7c
applying the local lights on translucent fix
2018-05-03 10:37:29 -07:00
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -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
Brad Davis
8e42bb8c87
Restore the stop functionality for a browser view when it's being destroyed
2018-04-27 17:35:38 -07:00
Bradley Austin Davis
acb21cc96a
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-27 10:50:47 -07:00
Brad Davis
e892694bf5
Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity
2018-04-27 08:13:35 -07:00
samcake
5db3eee4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 15:21:43 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
samcake
382161659e
Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork
2018-04-24 11:37:00 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
...
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
2018-04-24 11:22:48 -07:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
Andrew Meadows
e36dbab838
remove unused data member
2018-04-23 12:08:40 -07:00
samcake
3d651de797
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 13:20:19 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
Olivier Prat
46a1ff4dd2
Set jitter to O on RenderableWebEntityItems
2018-04-20 12:02:17 +02:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
samcake
b32be91bb1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 13:22:58 -07:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives
...
Forward pipelines for primitives
2018-04-16 11:18:56 -07:00
