SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
luiscuenca
ad42f6a590
Add method to check entities joint hierarchy
2018-12-01 12:32:29 -07:00
SamGondelman
2acb6b6857
v3 procedurals and shader fixes
2018-11-28 17:58:27 -08:00
Seth Alves
098440c273
fix a bug that broke Entities.setVoxel(). Fix polyvox textures
2018-11-27 10:43:33 -08:00
SamGondelman
e282d51883
CR
2018-11-26 01:15:07 -05:00
sabrina-shanman
be511378cd
Merge branch 'master' into hfm_serializer
2018-11-20 13:42:24 -08:00
Sam Gondelman
968ffe7ec3
Merge branch 'master' into branching
2018-11-16 10:25:02 -08:00
Sam Gondelman
a206d9e25a
Merge branch 'master' into branching
2018-11-14 17:08:08 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
sabrina-shanman
e08bc7296f
Merge branch 'master' into hfm_serializer
2018-11-13 15:41:49 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
sabrina-shanman
83cc90ace0
Re-name GLTFReader to GLTFSerializer and do the same for other model readers
2018-11-12 16:12:20 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
...
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -08:00
Jeff Clinton
b9c11aad7b
Merge pull request #14259 from SamGondelman/webLock
...
Case 18986: Enable interaction with locked web entity
2018-11-09 12:21:13 -08:00
SamGondelman
b3abd97707
projected materials and repeat property
2018-11-09 10:47:07 -08:00
Brad Davis
8c4237b520
Fix warnings
2018-11-08 12:27:56 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
SamGondelman
dc9405775f
more branching removal
2018-10-29 16:42:46 -07:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
SamGondelman
0efbdc1ab5
merge with master
2018-10-23 14:33:57 -07:00
Zach Fox
988bca201b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:36:46 -07:00
SamGondelman
2755cbcf4f
enable interaction with locked web entity
2018-10-23 12:00:50 -07:00
Brad Davis
c8e664a0a1
New SPIRV Shader toolchain
2018-10-23 10:40:12 -07:00
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
SamGondelman
5652fa0b1e
merge with master
2018-10-22 10:18:52 -07:00
Sam Gateau
6005b934ad
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
...
minor bug fix and optimization in ModelEntity animation
2018-10-19 17:02:48 -07:00
Brad Hefta-Gaub
e6ec32e515
Merge pull request #14222 from SamGondelman/material
...
Fix material entity opacity maps
2018-10-19 16:45:31 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape
...
Move blendshape buffers to render thread
2018-10-19 11:55:44 -07:00
Zach Fox
2a9e0041b2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 10:16:07 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3
2018-10-17 13:10:29 -07:00
Andrew Meadows
3b1b64b057
fix logic in readyToAnimate()
2018-10-17 11:45:39 -07:00
Andrew Meadows
da0d70af3f
don't use string comparison when polling for changed animation URL
2018-10-17 11:45:39 -07:00
Andrew Meadows
0c61779331
remove deprecated cruft; stub setAnimationURL() override
2018-10-17 11:45:39 -07:00
Andrew Meadows
148944814b
consolidate two bad string checks into one
2018-10-17 11:45:39 -07:00
SamGondelman
cce0981d6c
Merge remote-tracking branch 'upstream/master' into police
2018-10-17 11:40:01 -07:00
John Conklin II
7b226aa559
Merge pull request #14124 from SamGondelman/particle
...
Don't render particles without textures
2018-10-17 11:17:23 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
...
Fix "Good" collision not honoring mesh groups in OBJ files
2018-10-17 11:12:21 -07:00
SamGondelman
c5a94a415d
fix material entity opacity maps
2018-10-17 09:59:43 -07:00
SamGondelman
327c2f4e3d
move blendshape buffers to render thread
2018-10-10 15:32:53 -07:00
Zach Fox
7de784ce27
First steps (definitely not working)
2018-10-10 12:32:55 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3
2018-10-08 12:59:34 -07:00
sabrina-shanman
57f67ffe91
Do not have additional compoundMeshes variable in computeShapeInfo
2018-10-08 11:46:46 -07:00
sabrina-shanman
e15a41c839
Fix model being loaded before dimensions are initialized
2018-10-08 09:26:35 -07:00
sabrina-shanman
c8cccc5ec7
Fix "good" collision not subdividing OBJ meshes by group
2018-10-08 09:24:33 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3
2018-10-03 17:14:15 -07:00
John Conklin II
658c74a1c6
Merge pull request #14080 from huffman/fix/111-models-not-being-resized
...
Fix models with 1^3 dimensions never being resized
2018-10-02 14:11:45 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
John Conklin II
0ef407a45c
Merge pull request #14116 from sethalves/fix-bad-render-downcasts
...
get asan to not complain about invalid downcasts during transaction.updateItem
2018-10-01 16:57:03 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
...
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
2018-10-01 16:16:48 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged
...
Interstitial screen updates
2018-10-01 15:43:04 -07:00
SamGondelman
1ec481922c
don't render particles without textures
2018-10-01 14:54:34 -07:00
Dante Ruiz
652ec2210d
fixing loading issues
2018-10-01 13:58:14 -07:00
Seth Alves
f784b33eed
get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor
2018-09-30 15:25:21 -07:00
John Conklin II
11492ce8ee
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
...
don't call enterEntity before the entity's script is loaded
2018-09-28 16:07:08 -07:00
John Conklin II
5d00aa0bdb
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
...
fix scaling of worn shape entities
2018-09-28 13:08:46 -07:00
SamGondelman
09a6053044
cleaning up fragment shaders
2018-09-26 14:10:47 -07:00
Ryan Huffman
af897bdef2
Fix models with 1^3 dimensions never being resized
2018-09-25 09:13:59 -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
Thijs Wenker
06491ef12f
API function for retrieving multiple entity properties with better performance
2018-09-20 19:34:00 +02:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread
...
Fix particle acceleration spread
2018-09-19 11:49:42 -07:00
Seth Alves
1e8ae1a294
fix scaling of worn shape entities
2018-09-15 16:36:55 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Sam Gondelman
42ded53b5f
Merge branch 'master' into modelBugs
2018-09-12 14:35:46 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
SamGondelman
3daaa0ce81
empty urls are invalid
2018-09-10 11:45:40 -07:00
SamGondelman
a4605289a2
animation on switch url
2018-09-10 10:03:05 -07:00
Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Bradley Austin Davis
fade3a8de0
Fixing shader implicit type conversions
2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c
PR feedback: structure alignement and size
2018-09-06 09:07:53 -07:00
Brad Davis
5a5e1ad498
Remove uniforms from polyvox
2018-09-06 08:59:06 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
ec0b0ab464
fix acceleration spread
2018-09-04 13:03:42 -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
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49
faster aabox ray intersection and pre-computed inverse direction
2018-08-27 15:40:33 -07:00
danteruiz
e2cd695dfb
PR code clean up
2018-08-27 11:01:29 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -07:00
danteruiz
e4293d9ad5
fixing some entity visual problems
2018-08-26 21:50:01 -07:00
Dante Ruiz
92acaade2b
trying to fix problems
2018-08-24 17:13:57 -07:00
Dante Ruiz
af19849a75
fixing merge conflict
2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
...
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
SamGondelman
b5b7167644
add to stats
2018-08-23 17:56:24 -07:00
Andrew Meadows
3c01433e12
stub for avatars changing workload regions
2018-08-23 12:59:28 -07:00
SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
SamGondelman
5c0b12abf6
ordered ray/parabola intersection code
2018-08-22 16:29:17 -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
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
...
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -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
Brad Davis
f03370c826
Migrating to scribe program descriptors
2018-08-09 17:58:34 -07:00
SamGondelman
bd4a3a5b32
remove unused uniform buffer from polylines
2018-08-09 12:20:36 -07:00
SamGondelman
a0c3c09b05
Merge remote-tracking branch 'upstream/master' into bloom
2018-08-08 14:44:02 -07:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders
...
Miscellaneous shader fixes
2018-08-08 11:34:36 -07:00
SamGondelman
0dd8d2d3d4
working on enabling bloom
2018-08-07 18:18:58 -07:00
SamGondelman
de10dfb032
don't bind materials during shadow pass
2018-08-07 11:17:18 -07:00
SamGondelman
82029b4cb0
fix v1 and transparent procedurals
2018-08-07 09:28:40 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent
...
Fix primitives always drawing as transparents
2018-08-06 16:28:30 -07:00
SamGondelman
a7dec8fb75
parabola and particle shader fixes
2018-08-06 15:49:52 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23
Moving to cmake time shader compiling
2018-08-03 14:58:11 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
SamGondelman
2f358f3380
fix shapes always drawing as transparents
2018-08-02 12:16:01 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue
...
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
2018-08-01 11:15:32 -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
SamGondelman
7c8d080050
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-07-31 14:04:23 -07:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963
...
Support rendering of 'about' URLs in web entities
2018-07-31 09:44:31 -07:00
SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
Brad Davis
c991053c93
Support rendering of 'about' URLs in web entities
2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered"
2018-07-30 11:54:52 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
Seth Alves
32ec984f82
Merge pull request #13577 from dback2/invisibleWebEntities
...
Allow empty web entities to be rendered
2018-07-30 10:12:32 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot
...
Particles don't spin with head roll, new spin + rotateWithEntity properties
2018-07-27 14:54:48 -07:00
Sam Gateau
a95ddb0492
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
...
remove cruft for rendering collision shapes
2018-07-27 19:19:44 +02:00
SamGondelman
1c1b68ee66
emitterShouldTrail fix, review comments, rotateWithEntity
2018-07-26 11:41:16 -07:00
SamGondelman
4750611af9
particles don't spin with head roll, add particle spin properties, negative emitSpeed
2018-07-24 23:47:58 -07:00
SamGondelman
318ef907b8
parabola/polyvox, fixing some bugs
2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
Andrew Meadows
207aea8712
remove cruft from rendering collision shapes
2018-07-16 10:29:34 -07:00
SamGondelman
f9cdfbad7c
cleanup
2018-07-12 17:59:57 -07:00
SamGondelman
16ad9cb5d3
xcolor/rgbcolor conversion
2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30
vec3 conversion
2018-07-11 14:18:22 -07:00
SamGondelman
5bbd5b9e52
vec2 conversion
2018-07-10 16:32:49 -07:00
David Back
c4236d7442
allow rendering empty web entity
2018-07-10 13:53:18 -07:00
SamGondelman
ca5ce888f4
parabola triangle intersection
2018-07-09 18:11:57 -07:00
Dante Ruiz
ae03dcb57a
fix parent grab dropping and cullig flickering
2018-07-06 15:42:21 -07:00
SamGondelman
7130b5aa7f
fixing findRayIntersection bugs
2018-07-05 10:27:12 -07:00
SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
John Conklin II
e7d5ea561b
Merge pull request #13469 from hyperlogic/safeLandingFix4
...
Fix for landing on the roof of some domains.
2018-06-27 10:23:35 -07:00
Dante Ruiz
d8834af749
make requested changes
2018-06-26 11:53:45 -07:00
Dante Ruiz
17f4a27ceb
Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2
2018-06-26 10:55:27 -07:00
Anthony J. Thibault
328a485ad1
Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.
2018-06-25 10:38:53 -07:00
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
Dante Ruiz
f891c37ac8
fix particle entity
2018-06-20 10:59:19 -07:00
Dante Ruiz
3d4f164a9f
fixing web entity and whitespace cleanup
2018-06-19 16:53:36 -07:00
Dante Ruiz
694c272424
fixed text entity
2018-06-19 16:27:10 -07:00
Dante Ruiz
568ba6f777
fixing shape entity
2018-06-19 14:14:16 -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
samcake
bfdde6513f
Mergin with master
2018-04-12 15:45:27 -07:00
SamGondelman
e0b2c076ef
cleanup and fix forward procedural rendering
2018-04-11 13:03:57 -07:00
SamGondelman
d841eeb6e9
Merge remote-tracking branch 'upstream/master' into androidPrimitives
2018-04-10 16:52:08 -07:00
SamGondelman
0c069574c5
forward pipelines for primitives
2018-04-10 15:56:08 -07:00
SamGondelman
bba47ba2b4
materials on client only entities
2018-04-10 11:35:24 -07:00
Sam Gateau
9cb918a4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-09 20:03:26 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
Andrew Meadows
b515fd50fc
remove unused data member
2018-04-06 16:52:49 -07:00
SamGondelman
d38dadaf58
possible fix for qml texture leak
2018-04-06 09:34:00 -07:00
Andrew Meadows
ed1761945c
add/remove entities to physics using workload output
2018-04-06 07:22:05 -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
Stephen Birarda
3a8c9de4fb
fix some xcode warnings for unnecessary captured this
2018-04-04 10:38:32 -07:00
samcake
fa35d659dc
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-04-03 17:56:41 -07:00
samcake
59a081bcdb
merge with upstream
2018-03-30 18:08:38 -07:00
SamGondelman
5a7e9d8e3e
fix shadows on primitives
2018-03-30 09:48:04 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex
...
Materials on primitives
2018-03-21 12:08:24 -07:00
Cristian Luis Duarte
17fddd9e0e
RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface
2018-03-19 15:33:14 -03:00
Cristian Luis Duarte
ee6c65c1ac
Android - Prevent crash when setting the url property to _webSurface.
2018-03-16 12:03:26 -03:00
Andrew Meadows
3a3bc62bd0
Merge pull request #12636 from samcake/workload
...
Workload: Applying the transaction model to the Space & Proxies
2018-03-14 16:53:24 -07:00
Brad Davis
baa4dc3383
Don't leave trash web processes when changing web entity urls
2018-03-14 11:38:46 -07:00
samcake
2af88c11f2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 13:35:31 -07:00
SamGondelman
4adc357534
apply taa to text and web entities/overlays
2018-03-13 11:57:14 -07:00
samcake
7f8948fcce
Merge branch 'workload-master' of github.com:samcake/hifi into workload
2018-03-13 10:49:31 -07:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
Sam Gateau
a2993c7cdb
First version wof space working with Transaction & Collection
2018-03-13 01:45:21 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Sam Gateau
e3c8b9c62d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
2018-03-09 22:24:58 -08:00
Andrew Meadows
2750f3ee71
remove unused cruft and avoid useless work
2018-03-09 08:35:18 -08:00
Olivier Prat
da6bd92ff6
Merged with master
2018-03-09 10:07:25 +01:00
David Rowe
b461a422c6
Merge branch 'master' into 21709
2018-03-09 14:18:42 +13:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
NissimHadar
fda32e4aa4
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-08 12:16:36 -08:00
Sam Gateau
dc122b4ce8
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-07 18:14:44 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials
...
Material reflection
2018-03-07 14:29:31 -08:00
SamGondelman
96e48a0162
warnings
2018-03-07 13:50:51 -08:00
SamGondelman
19e4fb2355
materials on primitives
2018-03-07 12:22:17 -08:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08: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
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
SamGondelman
cc53b338db
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
2018-02-27 13:30:03 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
...
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-27 09:11:43 +01:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
SamGondelman
6fe2d46d7c
merge
2018-02-26 12:40:14 -08:00
Anthony J. Thibault
f5fcaae283
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-26 10:55:44 -08:00
Brad Davis
5aa15b5422
Fixing build warnings
2018-02-26 10:17:07 -08:00
humbletim
f824edd04e
* remove Model_temporary_hack
...
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034
material reflection
2018-02-23 17:58:46 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05:00
Anthony J. Thibault
0469eafbe4
Switch between dualQuats and matrix skinning based on model entity scale factor.
2018-02-22 18:35:16 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
humbletim
ec4f9fdc11
fix displayName
2018-02-22 08:31:05 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
Nissim Hadar
bf4ba07b72
Added parameters to canCastShadow - still sucks.
2018-02-21 12:36:34 -08:00
samcake
33b47f9ae2
Merging with the actual worloadspace managed from the EntityTreeRenderer
2018-02-21 10:34:58 -08:00
Olivier Prat
f53c2f41a5
Merge branch 'master' of http://github.com/highfidelity/hifi into prev
2018-02-21 09:46:38 +01:00
Andrew Meadows
9246f6c24a
render-perf depdends on workload library
2018-02-20 19:15:54 -08:00
Andrew Meadows
c3d08d06ff
remove cruft
2018-02-20 17:50:12 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Nissim Hadar
9921217807
Shapes casting shadows OK.
2018-02-19 12:32:11 -08:00
Nissim Hadar
6a9bbaf0a5
WIP - clean-up.
2018-02-19 12:00:30 -08:00
Olivier Prat
f5a2557a2e
Merged with master
2018-02-19 17:28:39 +01:00
David Rowe
9e37230aa1
Miscellaneous code tidying
2018-02-19 12:21:56 +13:00
Nissim Hadar
dc3b03c9bc
Added shadows to shapes - still sucks...
2018-02-16 18:37:47 -08:00
Nissim Hadar
4c1f22f84e
Models and Avatar cast shadows (box doesn't, yet).
2018-02-16 14:01:33 -08:00
Nissim Hadar
194c7f4101
WIP - for review.
2018-02-16 09:28:15 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
humbletim
145a0df082
interim checkin
2018-02-15 14:14:07 -05:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints
...
fix -- get children of animated entity joints to follow along, again
2018-02-14 11:12:45 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Andrew Meadows
8231a56b22
pull task out of render and into its own lib
2018-02-13 08:56:11 -08:00
Nissim Hadar
34aab4a9c8
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
2018-02-12 17:50:39 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
SamGondelman
ad40961864
fix tangents (I think), update material rendering when transform changes
2018-02-12 13:46:27 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
NissimHadar
950a62f3f8
Global graphics flag default to on.
...
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
2018-02-08 15:52:20 -08:00
Seth Alves
31c2b8fea9
oops
2018-02-07 16:31:38 -08:00
Seth Alves
b6ac348428
get children of animated entity joints to follow along, again
2018-02-07 16:30:07 -08:00
Bradley Austin Davis
fd007e845d
Squashed scribe changes
2018-02-07 10:29:29 -08:00
Bradley Austin Davis
ae092f6c0b
Merge remote-tracking branch 'upstream/master' into fix/shader_length
2018-02-07 09:48:23 -08:00
NissimHadar
d01f9cd1fb
Fixing git crap.
2018-02-06 23:51:08 -08:00
Bradley Austin Davis
0455fb37b6
Merge remote-tracking branch 'upstream/master' into fix/shader_length
2018-02-06 15:55:01 -08:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible
...
make polyvox entities visible again
2018-02-06 08:59:01 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Seth Alves
33ca1fd344
make polyvox entities visible again
2018-02-05 14:58:34 -08:00
Olivier Prat
92279b5939
Merged with master
2018-02-05 18:24:05 +01:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping
...
Fix another bootstrapping and rename entityItem _dirtyFlags
2018-02-02 15:14:38 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Dante Ruiz
c3b8565dea
min diff
2018-01-31 09:23:00 -08:00
Dante Ruiz
9c81909be5
restructures _dirtyFlags name and bits
2018-01-30 16:42:08 -08:00
Olivier Prat
5e6300ce46
Merged with master
2018-01-30 09:52:30 +01:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
Sam Gateau
e08e64b573
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-26 19:43:07 -08:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Dante Ruiz
3c12ed3b75
Merge branch 'master' of github.com:highfidelity/hifi into entity-joints
2018-01-25 16:03:15 -08:00
Olivier Prat
95882e0cde
Merged with master
2018-01-24 10:51:54 +01:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Dante Ruiz
2d70e76546
fix merge conflict
2018-01-22 15:15:11 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Seth Alves
c622cd8293
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 13:39:16 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b
works now
2018-01-18 13:15:47 -08:00
amantley
961ed88fb0
fixed coding standards in RenderableModelEntityItem.cpp
2018-01-18 12:56:24 -08:00
amantley
1c97272767
Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url
2018-01-18 12:09:28 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
Seth Alves
1c819c8422
formatting
2018-01-18 09:12:37 -08:00
amantley
9f484a7f57
Removed extraneous comments in RenderableItemEntity.cpp and .h
2018-01-18 08:54:05 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
amantley
4eb2a5cf5e
added a property check in renderableModelEntity for the animation url this fixes the bug stopping you from changing animations on an entity
2018-01-17 19:25:20 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Olivier Prat
efa6a8c0b5
Merged with master
2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17
Fixed compilation with new shader system
2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
Olivier Prat
3911ce59cc
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
2018-01-16 19:02:12 +01:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Nissim Hadar
daa6409936
Improved comments.
2018-01-15 17:33:48 -08:00
Sam Gateau
d6e771f01d
Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid
2018-01-13 10:02:53 -08:00
Dante Ruiz
283b9a8003
fix softEntity edge cases
2018-01-12 15:31:54 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2
Pass model offset from avatar skeletonModel to attached entity
2018-01-12 10:26:02 -08:00
Seth Alves
f81f50a6d2
non-models act correctly in mirror now'
2018-01-12 09:08:52 -08:00
Seth Alves
dbdc50ed24
also cauterize non-models that are children of head
2018-01-12 08:56:06 -08:00
Seth Alves
227dbd6f68
put this back to a working state
2018-01-12 08:52:07 -08:00
Seth Alves
9bdb89df2e
trying to get mirror to work
2018-01-12 07:26:09 -08:00
Olivier Prat
814de4ab81
Scribe now outputs shaders as cpp files.
2018-01-12 11:59:19 +01:00
Seth Alves
9d4ab13a10
cauterize all head-based entities rather than just models
2018-01-11 19:45:15 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture
...
Keep requesting render update until textures load
2018-01-11 14:09:21 -08:00
SamGondelman
e9d751fd23
try to avoid reusing uniform buffer locations
2018-01-10 17:01:01 -08:00
Dante Ruiz
980807c657
make changes
2018-01-10 16:50:41 -08:00
SamGondelman
df574c6bc9
keep requesting render update until textures load
2018-01-10 13:19:53 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
Nissim Hadar
9f25b01b10
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
2018-01-10 09:30:05 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb
...
More compact representation of meshes on GPU
2018-01-10 09:11:33 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta
...
Model meta render item is only withTypeShape if visual geometry request fails
2018-01-10 09:09:19 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5
...
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
2018-01-10 09:08:54 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Olivier Prat
db9e5fdae8
Merged from master but rendering seems broken
2018-01-09 11:05:34 +01:00
SamGondelman
4f5727e6b0
add _needsRenderUpdate flag
2018-01-08 17:10:44 -08:00
Nissim Hadar
b2b1807490
Changes per code review.
2018-01-08 15:37:06 -08:00
Nissim Hadar
46b494c802
Removed the Stage functionality - it is now implemented as a script.
2018-01-08 14:34:46 -08:00
SamGondelman
7c17603f3e
Merge remote-tracking branch 'upstream/master' into burp5
2018-01-08 14:27:31 -08:00
Nissim Hadar
452c16e706
Removed backgroundPropertiesChanged
2018-01-08 12:11:36 -08:00
Nissim Hadar
8206ae6ffb
Removed BackgroundMode packet type.
2018-01-07 13:50:42 -08:00
Olivier Prat
b296b96e5e
Merged with master
2018-01-06 10:01:00 +01:00
Nissim Hadar
9e5eba4d3a
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
2018-01-05 23:11:40 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov
...
Updating android toolchain for QML
2018-01-05 13:34:03 -08:00
Sam Gondelman
5cf25a20c9
use correct model ptr
2018-01-04 21:21:58 -08:00
Nissim Hadar
adbc4d0c39
Removed background mode from code (still in the protocol).
2018-01-04 18:23:25 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
Nissim Hadar
8bd2985f1f
Simplified code.
2018-01-04 13:06:28 -08:00
Dante Ruiz
527d00871a
making relaying translation work
2018-01-04 11:57:51 -08:00
Nissim Hadar
5b7ef9a3d3
Minor cleanup.
2018-01-04 09:13:58 -08:00
Dante Ruiz
e1a7f9bfb8
working on imporving soft-entities
2018-01-03 08:47:11 -08:00
humbletim
513a69cdcd
changes per CR feedback
2018-01-03 04:08:43 -05:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
Nissim Hadar
dad3a0d340
Fixed skybox inheritance.
2018-01-02 09:08:05 -08:00
Dante Ruiz
be9bf31843
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-02 08:04:26 -08:00
Nissim Hadar
0764e80996
Corrected behaviour of skybox modes.
2017-12-30 18:19:42 -08:00
nissim.hadar
b56c7535d2
Added legacy functionality (for zones that used Background "skybox")
2017-12-30 12:25:58 -08:00
druiz17
0ebbb76b49
fixed property over written issue and start relaying joints
2017-12-29 16:12:40 -08:00
Nissim Hadar
7260b4ff7b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
2017-12-29 15:16:14 -08:00
Nissim Hadar
87e896ab20
Zone inheritance ready for testing.
2017-12-29 15:13:46 -08: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
Nissim Hadar
85a81d6b5b
WIP - skybox inheritance
2017-12-28 18:23:49 -08:00
Nissim Hadar
64644fc980
WIP - skybox inheritance
2017-12-28 14:31:59 -08:00
Nissim Hadar
03cf7710d0
Ambient light inheritance
2017-12-28 09:34:55 -08:00
Nissim Hadar
7f5897e90b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-26 11:35:59 -08:00
Nissim Hadar
4ffd896ced
WIP - adding AmbientLightPropertyGroup
2017-12-26 11:15:33 -08:00
Nissim Hadar
0b73e7db3f
WIP - adding AmbientLightPropertyGroup
2017-12-26 09:15:13 -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
Nissim Hadar
affc5d1b86
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-24 15:27:32 -08:00
Nissim Hadar
3f82e9147b
Change keylight/ambient mode default from "enabled" to "inherit"
2017-12-22 16:30:19 -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
Nissim Hadar
8ee5f642a9
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -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
SamGondelman
5018edcfe0
reduce calls to getVisible
2017-12-22 12:59:06 -08:00
Nissim Hadar
e102b8c087
Fixed Ubuntu warning.
2017-12-22 08:35:09 -08:00
Nissim Hadar
502cac2ac7
Keylight inherit/off/on working
2017-12-22 08:05:12 -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
Olivier Prat
29485b65e5
Fixed potential crash when getting mesh from voxel item
2017-12-22 14:35:19 +01:00
Nissim Hadar
e974cac177
Keylight inheritance mode works.
2017-12-21 19:19:55 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
Dante Ruiz
77874de909
fix spacing
2017-12-21 15:05:23 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Dante Ruiz
ddddcae932
Merge branch 'master' of github.com:highfidelity/hifi into entity-joints
2017-12-21 08:29:56 -08:00
Brad Davis
26291e0a75
PR feedback
2017-12-21 07:29:29 -08:00
Nissim Hadar
58c6f8e9c4
Radio buttons now work correctly.
2017-12-20 19:17:18 -08:00
Dante Ruiz
29f0835475
making entity joints work again
2017-12-20 16:06:19 -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
Brad Davis
c6bc6f6ef2
Merge remote-tracking branch 'upstream/master' into android_nov
2017-12-16 16:20:16 -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
Brad Davis
6cff86b0f3
Fix polyvox archive, correct build errors, add additional libraries
2017-12-12 18:29:36 -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
Olivier Prat
1ce1aca79f
Merged with samcake's 'black' branch
2017-12-07 08:59:38 +01: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
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
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -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
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -08:00
Olivier Prat
103e036b70
Shadow maps rendered in cascades
2017-11-10 18:30:37 +01: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
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -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
SamGondelman
dd4275430b
fix hover events, working on HUD events
2017-11-02 17:48:37 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Andrew Meadows
2b06df1c33
call Model::scaleToFit() before update render items
2017-11-02 12:52:46 -07:00
Andrew Meadows
490483fde8
call Model::scaleToFit() before update render items
2017-11-02 12:32:51 -07:00
SamGondelman
657a0fb036
Merge remote-tracking branch 'upstream/pointers' into ui
2017-10-31 17:41:14 -07:00
SamGondelman
5a7298f15b
Merge remote-tracking branch 'upstream/master' into pointers
2017-10-31 17:33:52 -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
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -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
SamGondelman
76eb4c656e
fix multi-touch and keyboard on web entities
2017-10-30 16:41:59 -07:00
Nissim Hadar
349e12c065
Merge branch 'master' into hazeZone
2017-10-30 10:08:35 -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
Nissim Hadar
420b0f321c
Merge branch 'master' into hazeZone
2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b
Refactoring of the haze
2017-10-27 09:08:58 -07:00
Olivier Prat
dc8c75f403
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-27 15:56:40 +02:00
ZappoMan
e5becba4e9
migrate away from updateXXX standardize on setXXX
2017-10-26 20:38:07 -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
Olivier Prat
186b531be6
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-26 15:12:09 +02:00
Olivier Prat
9eed69d7ef
Trying to pin point a zone bug
2017-10-26 15:11:42 +02:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
samcake
5b0bbbb21e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-25 13:14:47 -07:00
Andrew Meadows
2d0b94817c
Merge pull request #11336 from 1P-Cusack/21389_PR2
...
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Sam Gateau
f38fa14a39
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-24 21:00:44 -07:00
Andrew Meadows
29efe53f74
repair debug rendering of collision shapes
2017-10-24 13:23:46 -07:00
LaShonda Hopper
a9fea4c7d3
[WL21389] Minor fix to RenderableShapeEntityItem::doRender (details below).
...
Shape isn't guaranteed to be permanent and thus the triangle count isn't
guaranteed to be the same since inception, so grab it each time.
Changes to be committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
2017-10-24 14:16:24 -04:00
