Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 19:17:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 74 branches 59 tags 1.2 GiB
Commit graph

3463 commits

Author SHA1 Message Date
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -08:00
ZappoMan
efc63a41e9 make sure true results for delete actually work, add more examples 2018-01-26 18:49:55 -08:00
ZappoMan
b883d006c8 add flags to support asking for specific messages, update examples 2018-01-26 18:26:48 -08:00
ZappoMan
a3d86a0242 cleanup 2018-01-26 17:37:24 -08:00
ZappoMan
aa82ad8855 adjust client to only delete entities on server echo 2018-01-26 14:57:36 -08:00
ZappoMan
aea16fe071 add delete filter support 2018-01-25 15:01:29 -08:00
Thijs Wenker
ce50380698 fix JSAPI typo 2018-01-25 22:47:35 +01:00
ZappoMan
c96e395a46 fix warning 2018-01-25 12:13:32 -08:00
ZappoMan
4497302a2b Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-25 11:39:56 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
humbletim
9fb20bee80 remove extra space 2018-01-23 15:13:53 -05:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05: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
Seth Alves
9be2c67f00 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 11:46:34 -08:00
Seth Alves
bce9b5f459 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-19 09:53:54 -08:00
Andrew Meadows
75b5635d2f less word salad 2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
ZappoMan
8364f64d4d Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-18 15:08:27 -08:00
ZappoMan
25f5eb6b4f named property example 2018-01-18 15:08:13 -08:00
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name 
Fixed typo in macro name
 2018-01-18 14:44:43 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Dante Ruiz
3e3b3a0a9e Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding 2018-01-18 08:56:01 -08:00
Dante Ruiz
93594fb0bb make dynamic entities collide with avatar when removing grab action 2018-01-18 08:55:51 -08:00
Seth Alves
76ef3d7c7d pull from upstream 2018-01-18 07:01:50 -08:00
Elisa Lupin-Jimenez
49e72346a4 fixed typo in macro name 2018-01-17 18:08:05 -08:00
SamGondelman
134a026d8a merge from master 2018-01-17 13:36:07 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -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
NissimHadar
9a382ebb86
Merge pull request #12177 from NissimHadar/defaultAmbientFix 
Set ambient mode to inherit if no URLs have been entered.
 2018-01-16 14:40:08 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Nissim Hadar
a1415e28ff If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit. 2018-01-15 15:11:10 -08:00
SamGondelman
f1253e3c6c fix crash on last frame = first frame, make last frame inclusive 2018-01-15 15:01:17 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
SamGondelman
241849139f wip 2018-01-15 10:21:16 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Nissim Hadar
50a030b68b Corrected copy of ambient URL. 2018-01-12 00:22:06 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop. 
Added copy of ambient URL.
 2018-01-11 19:35:13 -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
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00
Nissim Hadar
311e95e0d0 Corrected default values - for reading legacy content. 2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
ZappoMan
612f9621b4 adding filter properties to allow optimization 2018-01-11 12:48:39 -08:00
Nissim Hadar
d225f803d0 Corrected default values. 2018-01-11 12:28:44 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
ZappoMan
3936dda099 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-10 09:31:43 -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
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
ZappoMan
734ba3a8c5 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-09 15:29:20 -08:00
Nissim Hadar
4ecb056210 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 13:44:13 -08:00
Nissim Hadar
c841ec6c8c Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank. 2018-01-08 18:15:20 -08:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -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
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594 
Case 10594 - Fix entity property href not being able to reset (empty) ...
 2018-01-08 14:22:28 -08:00
Nissim Hadar
0a21e5de04 Removed _backgroundPropertiesChanged 2018-01-08 12:07:21 -08:00
Nissim Hadar
d0c0d6a388 Set skybox mode as per legacy background mode if needed. 2018-01-08 11:50:28 -08:00
Nissim Hadar
93fffb4bbe Removed PROP_BACKGROUND_MODE. 2018-01-07 14:21:22 -08:00
Nissim Hadar
8e793e790a Deleted unused include file. 2018-01-07 14:11:26 -08:00
Nissim Hadar
8206ae6ffb Removed BackgroundMode packet type. 2018-01-07 13:50:42 -08:00
Nissim Hadar
bc98cbd58f Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 23:26:28 -08:00
nissim.hadar
1acf7bae20 Removed reference to BackgroundMode. 2018-01-06 23:24:28 -08:00
Nissim Hadar
d5be9365fe Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 10:02:12 -08:00
nissim.hadar
33cc17a52f Removing unused Background mode. 2018-01-06 02:27:49 -08:00
nissim.hadar
d2ac27f1b8 Code clean-up 2018-01-06 01:48:58 -08:00
nissim.hadar
579aec7118 Only check for zone fields. 2018-01-06 01:37:23 -08:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Nissim Hadar
d645163294 Fixed gcc warning. 2018-01-05 13:16:02 -08:00
Nissim Hadar
635fd2d0cf Use older C++ version for Ubuntu 2018-01-05 12:48:21 -08:00
Nissim Hadar
3963c0a5a1 Code review improvements. 2018-01-05 12:22:20 -08:00
Nissim Hadar
cf7d6a2eab Added correct use of legacy background combo. 2018-01-04 20:30:10 -08:00
Nissim Hadar
c10d2a5461 Added correct use of legacy background combo. 2018-01-04 19:48:25 -08:00
Nissim Hadar
adbc4d0c39 Removed background mode from code (still in the protocol). 2018-01-04 18:23:25 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Andrew Meadows
a51d83c6e4 rollback automatic priority promotion to RECRUIT 2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f more correct volunteer ownership priority promotion 2018-01-04 15:53:03 -08:00
Andrew Meadows
fbe2dd8a41 remove unnecessary 'virtual' keyword 2018-01-04 14:46:16 -08:00
Andrew Meadows
13538006ec fix bug preventing sim owenrship on local domain 2018-01-04 14:46:16 -08:00
Nissim Hadar
8bd2985f1f Simplified code. 2018-01-04 13:06:28 -08:00
Nissim Hadar
e8770ec204 TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light). 2018-01-04 11:30:02 -08:00
Nissim Hadar
5b7ef9a3d3 Minor cleanup. 2018-01-04 09:13:58 -08:00
Dante Ruiz
674e8e1ac2 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-03 08:47:40 -08:00
humbletim
513a69cdcd changes per CR feedback 2018-01-03 04:08:43 -05:00
ZappoMan
f639e950e9 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-02 15:47:36 -08:00
Dante Ruiz
6fa3446c57 joints are being relayed to children 2018-01-02 13:54:13 -08:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable 
Stable merge back into master
 2018-01-02 13:24:03 -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
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
Dante Ruiz
30bbe6e41b added relayParentJoints property 2017-12-28 15:43:59 -08:00
Nissim Hadar
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
Nissim Hadar
1fa8f7c55b WIP - adding AmbientLightPropertyGroup 2017-12-26 09:15:45 -08:00
Nissim Hadar
0b73e7db3f WIP - adding AmbientLightPropertyGroup 2017-12-26 09:15:13 -08:00
Nissim Hadar
3f82e9147b Change keylight/ambient mode default from "enabled" to "inherit" 2017-12-22 16:30:19 -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
Dante Ruiz
86be684d7a delete code 2017-12-22 14:58:32 -08:00
Dante Ruiz
e316f71b31 fix grabbing 2017-12-22 14:53:48 -08:00
SamGondelman
5018edcfe0 reduce calls to getVisible 2017-12-22 12:59:06 -08:00
Seth Alves
533aa3d918 code review 2017-12-22 09:07:16 -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
Zach Fox
07a1cf434a IT'S WORKING!!! 2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce Progress? 2017-12-21 16:32:20 -08:00
Zach Fox
a2f2c23337 Change three lines of code. Fix one thing. Break another. 2017-12-21 16:32:15 -08:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
Zach Fox
e963673409 Progress? 2017-12-21 14:08:18 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
Zach Fox
b30d3fcc12 Change three lines of code. Fix one thing. Break another. 2017-12-20 15:40:10 -08:00
Nissim Hadar
d4b34b71ad First version with packet update. 2017-12-20 13:12:07 -08:00
ZappoMan
45f07718d3 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2017-12-19 12:59:17 -08:00
Andrew Meadows
bad2c1df76 proper modulus of animation frame 2017-12-19 10:40:17 -08:00
Seth Alves
63ac426bf2 fix logic that resets own-avatar collisions after a parenting grab is released 2017-12-19 08:13:44 -08:00
Seth Alves
ca45c4e8da fix logic that resets own-avatar collisions after a parenting grab is released 2017-12-18 17:30:56 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning 
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
 2017-12-18 15:20:23 -08:00
Daniela Fontes
7ca4a21a91 Fix entity property href not being able to reset (empty) once it was set with 
the correct input for the first time.
 2017-12-18 21:00:29 +00: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 Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes 
Fixed Entity Animation Property not applying to FBXs
 2017-12-15 15:31:11 -08:00
ZappoMan
17288386ae implement support for zone properties in filters 2017-12-15 10:42:29 -08:00
ZappoMan
5a843b1342 adding support for filters to get old properties 2017-12-14 11:14:09 -08:00
amantley
5bc113c818 deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous 2017-12-13 19:07:23 -08:00
Zach Fox
4980c769c0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning 2017-12-13 17:30:19 -08:00
Zach Fox
d388ca5ac9 Missed a spot. That was the problem the whole time. 2017-12-13 11:22:31 -08:00
Zach Fox
7113a72f2e Bugfixes 2017-12-12 18:04:20 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Zach Fox
bced55801d ABC ORDER! 2017-12-12 15:52:35 -08:00
Zach Fox
f5df83667f Add getStaticCertificateJSON() to Entity Scripting Interface 2017-12-12 15:50:04 -08:00
Zach Fox
1bd12857ef Add static certificate JSON versioning; add serverScripts to cert JSON 2017-12-12 12:07:08 -08:00
amantley
079d9639e4 Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp 2017-12-12 09:12:11 -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
c4b2422f53 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 19:40:52 -08:00
David Kelly
42b509639b Fix certificate hash 2017-12-07 17:22:00 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Dante Ruiz
0f3a70553c fix dynamic entities that are parented to your avatar 2017-12-06 11:18:15 -08:00
Dante Ruiz
8af1d8d8d0 dont run code if not nesscassry 2017-12-05 15:48:09 -08:00
Dante Ruiz
c58286d371 dont do work if not needed 2017-12-05 09:31:35 -08:00
Dante Ruiz
486cdf14d2 make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed 2017-12-04 15:34:53 -08:00
Dante Ruiz
a1bf54ff00 fix issue of no_bootstrapping not being set correctly 2017-12-04 11:16:41 -08:00
Dante Ruiz
03934549cc Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children 2017-12-04 09:08:11 -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
Dante Ruiz
1e6b5c0c75 make requested changes 2017-12-01 17:09:00 -08:00
Dante Ruiz
a1d90b5dd9 added extra bit 2017-12-01 15:41:13 -08:00
ZappoMan
750d505f9b fix issues in model import sizing caused by recent refactor 2017-11-30 17:51:59 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov 
Make buildable APK from Gradle
 2017-11-30 11:23:29 -08:00
howard-stearns
57ec73bb13 spacing 2017-11-29 14:37:20 -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
howard-stearns
281b4cfd88 Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA 2017-11-28 16:59:44 -08:00
Bradley Austin Davis
e4220aa44e Fixing warnings in android build 2017-11-28 14:32:30 -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
1eacf7cbda Merge remote-tracking branch 'origin/master' into character_entity_fixes 
This is to update the branch with the master branch
 2017-11-28 11:41:29 -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
howard-stearns
1575119327 PR feedback 2017-11-27 10:46:57 -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
howard-stearns
a6b437a79f get rid of "error" warning because the key wasn't broken into 64 char 
lines
 2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80 avoid a crash during domain change 2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd refactor 2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6 fix up dynamic ownership challenge 2017-11-22 15:58:30 -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
howard-stearns
ca80c9b764 Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:08 -08:00
ZappoMan
3a967ca895 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-21 10:53:29 -08:00
Thijs Wenker
627fee80ec added support for exporting parentJointName 2017-11-21 01:49:56 +01:00
Thijs Wenker
c3754d6369 smart pointer 2017-11-20 23:24:03 +01: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
Thijs Wenker
e94199acad Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName 2017-11-20 18:29:54 +01:00
Thijs Wenker
84ec9890ca reverted special property case, parentJointName is now only parsed from the JSON import 2017-11-20 18:29:33 +01: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
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic 
Make add entity atomic
 2017-11-18 14:27:12 -08:00
amantley
013d16cee9 this is the change to add a property for the currentframeplaying 2017-11-17 18:37:54 -08:00
ZappoMan
71a46a3374 cleanup 2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id 
Reset EntityTreeSendThread known state if client disconnects from Entity Server
 2017-11-17 12:56:25 -08:00
Thijs Wenker
3c37bf8acd parentJointName property experiment 2017-11-17 20:33:06 +01:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a 
Particles emitter fixes
 2017-11-17 11:31:12 -08:00
H Q
28eedd1a94 Small style mod 2017-11-17 11:30:21 -08:00
Stephen Birarda
dd27e3db31 add diff traversal reset when resetting state 2017-11-17 09:44:35 -08:00
ZappoMan
cd0fa989e1 debugging 2017-11-17 08:55:55 -08:00
H Q
21a28827c9 Remaining coding style changes, other small fixes 2017-11-17 07:59:52 -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
H Q
14890495a2 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 
Syncing
 2017-11-16 12:38:45 -08:00
H Q
27350ddbfc Coding style corrections 2017-11-16 12:35:00 -08:00
Andrew Meadows
d538a9aaa8 fix typo making cylinders collide as sphere 2017-11-15 09:04:04 -08:00
H Q
0db9e876d6 Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet 2017-11-14 15:40:44 -08:00
H Q
44f2c92d30 Final ECSDA and nonce modifications for this dev cycle 2017-11-14 15:40:29 -08:00
David Rowe
2c542b73a0 Fix particles emitter rendering not updating when edit textures URL 2017-11-10 10:22:35 +13: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
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580 
Fix serverScripts not being able to see entities in parent/child tree
 2017-11-07 10:36:20 -08:00
David Rowe
05275afb4f Resending full scene is not necessary after all 2017-11-05 15:48:02 +13:00
David Rowe
2d27a6cf4c Merge branch 'master' into 21580 2017-11-05 13:59:43 +13:00
ZappoMan
d4b4d188ed allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU 2017-11-04 13:40:41 -07:00
ZappoMan
74ceab1e68 fix mac and unic build 2017-11-02 19:30:39 -07:00
ZappoMan
baff900839 cleanup some writeLocks 2017-11-02 17:46:15 -07:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
ZappoMan
53c6eeb58b updatePosition now setPosition 2017-11-02 15:58:50 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Zach Fox
bb1ffbc06f Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests 2017-11-01 12:38:34 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
David Rowe
328fc29bc5 Fix serverScripts not being able to see entities in parent/child tree 2017-11-01 17:01:19 +13:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -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
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
a5a135c2ba Fixes for 8672-8674. 2017-10-27 15:39:14 -07:00
ZappoMan
1000318dff tweak min dimension to match current behavior 2017-10-27 14:26:02 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Andrew Meadows
2c4d4373dc support asymmetrical cross section Cylinder 2017-10-27 10:41:16 -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
Andrew Meadows
474609dabf enforce dimensions of Circles and Quads 2017-10-26 22:58:24 -07:00
Andrew Meadows
901e145712 remove redundant dimensionsChanged() 2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577 more cleanup 2017-10-26 21:30:59 -07:00
ZappoMan
e5becba4e9 migrate away from updateXXX standardize on setXXX 2017-10-26 20:38:07 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -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
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -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
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
ZappoMan
a1885926b5 some cleanup 2017-10-24 11:46:42 -07:00
LaShonda Hopper
dbd1a80046 [WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below). 
* Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its
  entity::Shape type was changed.
* Adds getNameForShapeType static method to ShapeInfo.
** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp
* Adds collisionShapeType to ShapeEntityItem::debugDump

* Tested creating shapes within the Creation Menu:
** Create Menu -> (Box/Sphere)
*** Observe Properties tab auto-focus
** From Properties tab elect alternate shape type from the Shape Dropdown list.

NOTE:  While this fixes an issue with the collision shape, it doesn't completely
       resolve the issues seen with the polyhedra or polygonal shapes noticed on
       RELEASE-7130 rebase.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   libraries/entities/src/EntityItemProperties.cpp
    modified:   libraries/entities/src/ShapeEntityItem.cpp
    modified:   libraries/shared/src/ShapeInfo.cpp
    modified:   libraries/shared/src/ShapeInfo.h
 2017-10-24 14:16:24 -04:00
LaShonda Hopper
789b850846 [WL21389] Addresses feedback from PR #11336. 
* Removes todos from ShapeEntityItem::shapeCalculator stub commit.
* Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape.
* Moves cone handling to its own section for better contextual flow.

Changes Committed:
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
 2017-10-24 14:16:23 -04:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). 
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
 2017-10-24 14:16:17 -04:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Andrew Meadows
9981a44b71 add hook for ShapeInfo calculator 2017-10-24 14:15:08 -04:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Zach Fox
3e139283ba Remove unnecessary newlines 2017-10-23 17:31:21 -07:00
Zach Fox
97d44e62c8 Fix bugs 2017-10-23 16:52:32 -07:00
Zach Fox
53081b51a6 Clean up as much as possible 2017-10-23 16:00:39 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Sam Gateau
7754061505 Merge pull request #11634 from highfidelity/hazeZone 
Fogbugz 8477: Crash on loading older domains that have zones without the haze component.
 2017-10-20 16:01:13 -07:00
Seth Alves
2b0285adc2 fix action (grab) deadlock 2017-10-20 15:05:21 -07:00
Nissim
5d0deaf946 Code review fixes. 2017-10-20 14:27:27 -07:00
Nissim
00c99d3d02 Corrected wrong else format. 2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables 
Faster renderables update
 2017-10-20 13:43:08 -07:00
Nissim
b0ca1353e4 Implemented Haze mode default. 2017-10-20 13:32:27 -07:00
Zach Fox
9e68e805a0 Get marketplace public key from backend 2017-10-20 10:38:59 -07:00
Zach Fox
c99e803ab7 Error handling 2017-10-19 17:19:37 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Nissim
d01ecb71df Fixed gcc warning. 2017-10-19 14:41:02 -07:00
Nissim
e314ee432e Fixed gcc warning. 2017-10-19 14:20:47 -07:00
Nissim
9af87d46f2 Removed optimize pragma. 2017-10-19 13:51:33 -07:00
Nissim
61fc45c6bf Merge branch 'master' into hazeZone 2017-10-19 13:39:18 -07:00
Nissim
edd256c600 Fixed crash on invalid HazeMode. 2017-10-19 13:36:32 -07:00
Seth Alves
2c8c5e214c puff querybox if entity is in motion 2017-10-19 13:19:41 -07:00
Seth Alves
e8ca455547 cleanups + call updateQueryAACube when parent changes or action is deleted 2017-10-19 13:19:35 -07:00
Seth Alves
c1e8d5144c remove code which is no longer needed because of custom physics setters 2017-10-19 13:19:25 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
ae70f091c3 don't accept updates to queryAACube if this interface is simulation owner 2017-10-19 13:18:45 -07:00
Seth Alves
f75e59c0a6 keep grabbed and worn entities from spamming entity-server 2017-10-19 13:18:37 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 10:58:55 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Zach Fox
e1b0e5a2dd Move some include files around 2017-10-16 16:00:32 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
Zach Fox
3c572b0f7a Fix deadlock 2017-10-16 13:41:39 -07:00
Zach Fox
960f1fbfe4 Still broken, but safer 2017-10-16 13:28:14 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
Andrew Meadows
23bb8608b1 minor optimizations in updateModelBounds() 2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
Nissim Hadar
afb8b2d8e7 Merge branch 'master' into hazeZone 2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Nissim Hadar
5bfbaf4860 Renamed HazeMode to ComponentMode. 2017-10-13 11:24:56 -07:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread 
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
 2017-10-12 17:37:05 -07:00
SamGondelman
cc8ecdc596 put back entity signals for scripts 2017-10-12 17:28:00 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Zach Fox
1400c66506 Be a bit more thorough 2017-10-12 16:58:48 -07:00
Zach Fox
b56a38ca15 Re-add references to recentlyDeletedEntityItemIDs 2017-10-12 16:32:09 -07:00
Zach Fox
d75c0a00bb Closer than ever 2017-10-12 16:29:05 -07:00
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
SamGondelman
1a047613bf fix pointerevents on entities from scripts 2017-10-12 12:31:36 -07:00
Zach Fox
50446619f5 Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs 2017-10-12 11:59:46 -07:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Anthony J. Thibault
0a943fbe7b Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. 
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.

The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
 2017-10-11 17:32:34 -07:00
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Zach Fox
5a3a3c4937 What is going on 2017-10-11 15:05:45 -07:00
Zach Fox
fa1bfe0d19 Maybe fixes? 2017-10-11 14:10:33 -07:00
Zach Fox
d8b84e6875 Minor cleanup 2017-10-11 13:26:32 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
Zach Fox
f05c709693 Remove static certificate verification for now 2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952 Updates now that endpoint exists; add pending timer 2017-10-11 11:46:35 -07:00
Zach Fox
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
Nissim Hadar
c9be5ea100 Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone 2017-10-09 18:01:48 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Zach Fox
a7d43c63b6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-09 11:38:13 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Zach Fox
c70ee6055f Don't clear cert ID if static properties change; updates to DDV 2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Nissim Hadar
e34fb1c874 Merge branch 'master' into hazeZone 2017-10-06 13:20:12 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Seth Alves
9064114ce5 fix mistaken logic-flip in recent PR 2017-10-06 11:03:48 -07:00
Seth Alves
f4dedf05bb move variables into block that needs them 2017-10-06 11:02:26 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Nissim Hadar
1e2bd23c0b Fixed typo in variable name. 2017-10-05 11:31:08 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8 WIP - implementing range+altitude mode. 2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57 Haze Range works. 2017-10-04 21:47:20 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
4cfb860e23 Wow, this actually seems to be working 2017-10-04 15:45:12 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
Nissim Hadar
eef778a463 Replaced uint8_t with uint32_t in server packet. 2017-10-04 13:47:13 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Nissim Hadar
62cfaaaf38 Sam's corrections. 2017-10-04 12:56:14 -07:00