Commit graph

2769 commits

Author SHA1 Message Date
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Sam Gondelman
c8ab7ac37f
fix bad copy 2019-02-16 18:08:05 -08:00
SamGondelman
3e3bd2ffd8 fix transform properties not changing 2019-02-15 16:57:29 -08:00
SamGondelman
6bf1545285 fix build error 2019-02-15 16:44:28 -08:00
SamGondelman
3df231f1e0 it's working! 2019-02-15 14:43:22 -08:00
SamGondelman
c92b82e744 merge with master 2019-02-15 12:43:30 -08:00
SamGondelman
87ab255115 finish moving materials to rendering 2019-02-15 11:49:20 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
2019-02-14 17:44:48 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
SamGondelman
3f8bfc5475 CR and fix deadlock 2019-02-13 16:19:39 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
John Conklin II
78f0a3feaa
Merge pull request #14739 from SamGondelman/animations
Case 20398: Fix animation URL change
2019-02-08 14:40:24 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone
Case 19291: Fix zone bugs
2019-02-08 14:07:26 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall
Case 20829: Always fall when flying is not allowed
2019-02-07 14:39:46 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures
Case 20944: Fix Model textures property
2019-02-07 14:19:01 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
SamGondelman
31cf623252 fix keyboard focus 2019-02-04 12:44:04 -08:00
SamGondelman
391cca787f fix keyboard textures and text display 2019-02-01 15:33:53 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
SamGondelman
50bfe84aa7 fix keyboard intersection, laser alpha 2019-02-01 12:11:00 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
Clement
283dabc622 Fix reload mechanic for entity server scripts 2019-01-30 17:29:28 -08:00
SamGondelman
834e44dd3a make polyline's with faceCamera not depend on normal 2019-01-30 11:02:24 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
SamGondelman
56096708d3 one more try 2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9 fix color space 2019-01-29 14:52:57 -08:00
SamGondelman
7fa676a846 don't render text parts if alpha == 0 2019-01-29 08:25:17 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c trying to fix web surfaces?? 2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
Sam Gondelman
4d83c7f6df
fix line rendering mode 2019-01-27 00:02:06 -08:00
SamGondelman
8f0bd2449b pointerevents are working! 2019-01-26 21:53:46 -08:00
SamGondelman
abd7d6bddf some stuff is working! 2019-01-26 01:39:13 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough
Case 20241: Material entity fallthrough
2019-01-25 14:01:27 -08:00
SamGondelman
ca8d64bc05 removing overlays wip 2019-01-24 14:59:45 -08:00
SamGondelman
0bfcde67ea remove overlays from application.cpp 2019-01-24 14:11:24 -08:00
SamGondelman
5d19666f60 merge with master 2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
SamGondelman
618146e885 fix animation url change 2019-01-18 15:36:10 -08:00
SamGondelman
d17e04967a fix zone bugs 2019-01-18 13:49:16 -08:00
SamGondelman
8d2e81a13b Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-17 10:27:43 -08:00
SamGondelman
62b853816a deprecate the new property so that people hopefully don't use it 2019-01-16 19:35:15 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
SamGondelman
1d2270e9c7 web entity fixes 2019-01-15 16:51:36 -08:00
SamGondelman
9803043512 web entity fixes 2019-01-15 09:51:55 -08:00
Dante Ruiz
4ab7308669 addressing code review requests 2019-01-14 14:04:01 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
SamGondelman
6fd34bf1f0 setup qml surface contexts 2019-01-14 09:26:57 -08:00
Dante Ruiz
8252481ce7 Delete domain entities only 2019-01-11 16:00:10 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
SamGondelman
292071febb fix model groupCulled 2019-01-08 14:34:19 -08:00
SamGondelman
5dd59dd9e9 correct lighting of layered shapes 2019-01-08 14:02:57 -08:00
SamGondelman
10068cc42c merge with master 2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones
Case 15518: shaped zones
2019-01-08 09:06:45 -08:00
SamGondelman
3341d75eda merge with master 2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
2019-01-07 14:53:27 -08:00
SamGondelman
ff3545beab working with texture transform fallthrough 2019-01-07 13:28:00 -08:00
SamGondelman
5cded6938b possible fix for texture path 2019-01-07 11:55:34 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity
data url for web entity
2019-01-04 14:21:55 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
1fabaf0db4 rename getCollisionGeometryResource to fetchCollisionGeometryResource 2019-01-04 12:37:23 -08:00
Andrew Meadows
0072684d98 remove cruft and fix error in transform to mesh frame 2019-01-04 12:37:23 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8 2019-01-03 15:11:48 -08:00
SamGondelman
a2fe8ef9e7 merge with master 2019-01-03 13:51:07 -08:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
SamGondelman
a9d798070a wip 2019-01-02 18:08:59 -08:00
SamGondelman
1a62b59a8f Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-02 10:11:46 -08:00
SamGondelman
32bec57cfe Merge remote-tracking branch 'upstream/master' into NOverlays6 2019-01-02 09:53:29 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4
Case 20134: Grid Entities
2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
2019-01-02 09:00:56 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3
Case 20080: v3 + v4 procedurals and misc shader fixes
2018-12-28 15:17:50 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
2018-12-27 15:43:17 -08:00
howard-stearns
af65e59ba3 Recognize data: URLs in Web entities. 2018-12-27 14:34:59 -05:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
SamGondelman
9155853889 working on material fallthrough 2018-12-20 16:03:58 -08:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
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
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08: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
SamGondelman
05e0fb464e new improved polylines 2018-12-19 15:01:49 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
sam gateau
9c436bc28c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-19 09:31:41 -08:00
Jeff Clinton
16c7619aa7
Merge pull request #14608 from SamGondelman/zone
Case 19080: Fix zone with invalid script not loading
2018-12-19 08:49:33 -08:00
sam gateau
b8d96d98b8 fixing warnings from the build 2018-12-18 16:25:24 -08:00
sam gateau
265b1591d6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-18 14:43:12 -08:00
sam gateau
2f18555ee0 removing comments and dead code, rewiring the debug 2018-12-18 14:42:45 -08:00
SamGondelman
7231116e43 fix zone with invalid script not loading 2018-12-18 13:04:56 -08:00
Jeff Clinton
889f110357
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter
fix a bug that broke Entities.setVoxel().  Fix polyvox textures
2018-12-18 12:15:07 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
SamGondelman
6094a2f0a0 add back line entities, undo polyline changes temporarily 2018-12-14 15:41:11 -08:00
SamGondelman
5dd00bed1d new improved polylines 2018-12-14 14:15:56 -08:00
SamGondelman
770da220d7 cleanup entity properties more and start polyline work, remove lines 2018-12-12 16:47:35 -08:00
SamGondelman
b261665072 working on lines 2018-12-12 09:39:01 -08:00
SamGondelman
250baa9c72 add missing properties to text entities 2018-12-11 15:42:24 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Sam Gateau
d5b127d258 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-10 21:35:41 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent
Add method to check entities joint hierarchy
2018-12-11 01:06:38 +00:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4 2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
2018-12-06 11:13:46 -08:00
sam gateau
a267c3115a drafting more factorisation of render tasks 2018-12-05 17:47:33 -08:00
SamGondelman
9923e76968 cleanup 2018-12-05 17:18:26 -08:00
Sam Gondelman
df6fbefc31
Merge branch 'master' into v3 2018-12-05 16:51:33 -08:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching
Case 19473: Reduce branching in our shaders
2018-12-05 16:42:42 -08:00
SamGondelman
305cb6d323 grid entities 2018-12-03 18:04:34 -08:00
SamGondelman
98f9dc0ca4 remove grid entity files 2018-12-03 12:07:26 -08:00
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
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
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