Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78613 commits 25 branches 28 tags 1.2 GiB
Commit graph

29370 commits

Author SHA1 Message Date
Shannon Romano
a00545b48d
Merge pull request #15361 from SaracenOne/falling_push 
Case 22121: Allow players to disable automatic falling to flight threshold.
 2019-04-26 14:03:52 -07:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate 
Case 22253: Refresh Rate Controller
 2019-04-26 12:04:39 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait 
Skeleton Trait Implementation
 2019-04-26 10:14:47 -07:00
danteruiz
b60e35040e another round of CR 2019-04-26 10:08:06 -07:00
Anthony Thibault
93b03a588f
Merge pull request #15445 from amantley/AnimRandomSwitchSquash 
AnimRandomSwitch class for random idle implementation
 2019-04-26 10:06:37 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330 
Case 22330: Regularize JSDoc deprecation notices
 2019-04-26 09:48:45 -07:00
Sam Gateau
dc7abe1aff
Merge pull request #15450 from amerhifi/feature/macScreenScale 
Case 22350: Setting mac default for resolution render scale
 2019-04-25 19:33:54 -07:00
Angus Antley
395a4cc9c4 added final animations and json to the resource 2019-04-25 19:14:31 -07:00
Shannon Romano
d0108301a0
Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText 
Case 22297: Fix Mute Warning Switch Text
 2019-04-25 17:11:45 -07:00
jennaingersoll
24196e2776
Merge pull request #15321 from ctrlaltdavid/M21956 
Case 21956: Audio JSDoc
 2019-04-25 17:03:58 -07:00
danteruiz
9e1671a1bf making requested changes 2019-04-25 16:02:12 -07:00
luiscuenca
080f891c9f
Fix scale and refactor debug function 2019-04-25 14:54:40 -07:00
Angus Antley
27ed468946 made changes requested 2019-04-25 14:42:41 -07:00
NissimHadar
2685550cc1 Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable 2019-04-25 14:18:43 -07:00
Shannon Romano
766854081a
Merge pull request #15457 from davidkelly/dk/22291 
Tiny logical error in wallet creation
 2019-04-25 14:10:00 -07:00
NissimHadar
261277e4c1 Wrong method call fixed. 2019-04-25 13:49:56 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix 
Fix crash sending other avatars hands to flow
 2019-04-25 12:32:06 -07:00
Thijs Wenker
cdcdae2fda
Merge pull request #15393 from ctrlaltdavid/M22188 
Update Record app per Marketplace certification requirements
 2019-04-25 20:00:13 +02:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark 
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
 2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
Angus Antley
baca58360e updated json and talk_righthand anim 2019-04-25 09:50:12 -07:00
David Kelly
c63ee8d4f6 Tiny logical error in wallet creation 2019-04-25 09:21:06 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
65f9099ea5 Fix up deprecated notices 2019-04-25 19:29:17 +12:00
Angus Antley
ea173b8d61 more time for talk ease in and updated json random choice times 2019-04-24 21:29:55 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings 
Case 22065: Fix mac warnings
 2019-04-24 20:32:29 -07:00
David Rowe
73fd61dcf0 Picks, PickType, RayPick JSDoc update 2019-04-25 13:19:07 +12:00
Simon Walton
5f986bbeb7 New banner cpp files 2019-04-24 17:49:35 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
404be42bfb
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior 
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
 2019-04-24 16:35:02 -07:00
Shannon Romano
0051693da8
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings 
Case 22298: Persist Mute Settings Between Sessions
 2019-04-24 16:34:34 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Shannon Romano
10cfa9557d
Merge pull request #15448 from wayne-chen/fixMarketplaceLoginBug-83 
Case 22346: Market -- Please Login -- does not work
 2019-04-24 16:13:43 -07:00
Angus Antley
eb0506ee12 updated json 2019-04-24 14:58:30 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
amerhifi
cc3c75c8d1 adding mac default for screen scale 2019-04-24 10:24:48 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
Wayne Chen
464e5924d6 changing method name to reflect recent change in code 2019-04-23 16:59:12 -07:00
NissimHadar
6f4ee601fb CR corrections. 2019-04-23 13:27:21 -07:00
NissimHadar
ec69fd38eb Added set minimum GPU texture memory cycles to API. 2019-04-23 12:26:13 -07:00
SamGondelman
48aef3e6d9 build error 2019-04-23 10:46:53 -07:00
amantley
70d8200bdc added on done for movement7 to json 2019-04-23 10:40:37 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
Angus Antley
1291ee5ebc added new animations to the resource 2019-04-23 07:43:31 -07:00
David Rowe
7dde764907 Merge branch 'master' into M21956 
# Conflicts:
#	libraries/audio/src/Sound.h
 2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
NissimHadar
f786f5a4a6 Corrected jsdoc comment. 2019-04-22 16:00:44 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
luiscuenca
4a236c3a4b
Fix warnings 2019-04-22 12:40:56 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
Wayne Chen
55f3c3a11a allowing context change to change mute state 2019-04-19 18:28:10 -07:00
Simon Walton
5e251b1033 Don't double-free an openssl struct 2019-04-19 17:03:43 -07:00
Wayne Chen
38115b0c09 simplify PTT logic 2019-04-19 07:30:48 -07:00
Wayne Chen
da8f8e0873 real fix 2019-04-18 14:46:08 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
Wayne Chen
5baf2f21d8 adding settingsLoaded bool check 2019-04-18 07:48:59 -07:00
Wayne Chen
3b1751f2c9 adding proper logic for shield icon behavior 2019-04-17 20:19:21 -07:00
Wayne Chen
7d38cd9290 change text to display 2019-04-17 17:25:02 -07:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling 
Case 21513: Keyboad doesn't scale to avatar after reloading content
 2019-04-17 16:59:42 -07:00
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed 
Allow Hand Animations to be Overridden
 2019-04-17 11:53:41 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix 
Case 22192: Adjust run speed constants.
 2019-04-16 14:51:23 -07:00
amantley
ba9b539bd2 removed hand fbx files that will be used in the future for default hand overrides 2019-04-16 14:12:32 -07:00
David Rowe
60298245da Menu JSDoc update 2019-04-16 11:24:24 +12:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble 
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
 2019-04-15 15:15:53 -07:00
David Rowe
249df3dce4 Update Record app per Marketplace certification requirements 2019-04-16 07:53:55 +12:00
Roxanne Skelly
3949ca2638 Remove logging and bump build. 2019-04-15 12:35:36 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
Roxanne Skelly
743d626b32 Merge branch 'master' of https://github.com/highfidelity/hifi into Case21707 2019-04-15 10:27:28 -07:00
Roxanne Skelly
8f9d8372d8 Public Key was getting corrupted. 2019-04-12 20:30:03 -07:00
Roxanne Skelly
e36a8fc6a2 Fix osx/ubuntu build error 2019-04-12 18:36:14 -07:00
danteruiz
246f11ba02 fixing bubble 2019-04-12 17:11:35 -07:00
Shannon Romano
d321ae9b79
Merge pull request #15284 from amantley/eyeRotationOverrideBug 
Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
 2019-04-12 17:06:11 -07:00
Roxanne Skelly
3bf8fb5d95 Case21707 - Wallet doesn't work if user has unicode characters in windows username 2019-04-12 16:40:41 -07:00
David Rowe
1906ce7812 HMD JSDoc update 2019-04-13 11:10:33 +12:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989 
Case 21989: AvatarList and AvatarManager JSDoc
 2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052 
Case 22052: Camera JSDoc
 2019-04-12 12:26:39 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
Saracen
3dde53f743 Friendlier and more understandable naming. 2019-04-11 03:57:34 +01:00
David Rowe
38e21dcaa2 Doc review 2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
David Rowe
a7b1d613d3 Doc review updates 2019-04-11 10:27:17 +12:00
David Rowe
617617736e Merge branch 'master' into M22052 2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities 
Case 21883: Fix safe landing code improperly finding local entities
 2019-04-10 12:28:07 -07:00
Sam Gateau
feb2757990
Merge pull request #15302 from sethalves/fix-linux-window-manager-fight 
case 21994: cooperate, rather than fight with, Linux window managers
 2019-04-10 12:26:10 -07:00
Sam Gateau
d7e5f1eb8e
Merge pull request #15280 from kitely/fix-startup-race-condition 
case 21981: Fix startup race conditions in Interface
 2019-04-10 11:30:23 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing 
Case 21930: Don't change OpenGL context state every frame
 2019-04-10 09:42:09 -07:00
David Rowe
9a70416f2b Update Clipboard JSDoc 2019-04-10 12:09:48 +12:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Saracen
bce80130bd Allow players to disable automatic falling to flight threshold. 2019-04-09 21:07:17 +01:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization 
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
 2019-04-09 12:57:03 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
John Conklin II
759d59c709
Merge pull request #15336 from r3tk0n/controller-help-update 
Case 22069: Update Controller Help Screen
 2019-04-05 17:31:29 -07:00
maspring
575d9673e2
Merge pull request #15338 from danteruiz/another-fading-avatar 
Case 22074: Avatars ignored via PAL or bubble (shield) leave semi-permanent copies of themselves
 2019-04-05 17:21:28 -07:00
Roxanne Skelly
4565bd7e77
Merge pull request #15340 from roxanneskelly/Case21890 
Case 21890 - Marketplace search doesn't refresh when enter is pressed
 2019-04-05 16:40:29 -07:00
r3tk0n
d6ff1caee9 Convert tabs to spaces. 2019-04-05 16:32:20 -07:00
Sam Gondelman
19b109c1f7
Merge pull request #15333 from highfidelity/revert-15266-stencil 
Case 22070: Revert "Case 20060: Grab correct stencil masks from display plugins"
 2019-04-05 16:23:26 -07:00
r3tk0n
9dda272acd Update gamepad with new graphic. 2019-04-05 16:22:31 -07:00
r3tk0n
6d03182ed9 Fix scaling issue. 2019-04-05 16:21:42 -07:00
David Back
e8b4b8b74c
Merge pull request #15290 from dback2/fixDeleteKeyInHMDDoesCtrlDelete 
Case 20880: Fix delete key doing ctrl + delete in HMD
 2019-04-05 16:06:01 -07:00
r3tk0n
e3fdbc3b3c Set bounds of image. 2019-04-05 15:44:34 -07:00
Roxanne Skelly
057ee2b01c Case 21890 - Marketplace search doesn't refresh when enter is pressed 2019-04-05 15:20:23 -07:00
danteruiz
475cf4d6f7 fix another fading avatar 2019-04-05 15:10:30 -07:00
r3tk0n
e03e78cc8c Add href element to image. 2019-04-05 15:04:35 -07:00
r3tk0n
84a67641a8 Update images. 2019-04-05 14:39:02 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00
Olivier Prat
57de55c5ce Fixed crash in lasterpointer 2019-04-04 10:15:38 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
Sam Gateau
0d8169bd35
Merge pull request #15311 from danteruiz/double-avatars 
Case 21415: Avatars stay behind after they disconnect
 2019-04-03 16:07:35 -07:00
David Rowe
a6ae79a2d8 Misc. fixes. 2019-04-04 11:34:10 +13:00
David Rowe
93f917527d Merge branch 'master' into M21956 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-04-04 11:06:09 +13:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
danteruiz
5f5e7d5f4e a better fix 2019-04-03 10:45:40 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid 
Case 21893: Remove disabling of --url for Android.
 2019-04-03 07:50:31 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07:00
danteruiz
d88a13fc80 fix keybaord scaling 2019-04-02 13:28:41 -07:00
NissimHadar
6b83f2f94d Set stability count to 2 (enough for nitpick) 2019-04-02 08:39:04 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading 
Case 21415: Avatars stay behind after they disconnect
 2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
danteruiz
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates 
Case 21899: New Audio Mute States
 2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
a9802570d7
Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml 
Case 22003: Reuse Blank Space from Volume Slider
 2019-04-01 14:23:27 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
 2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function 2019-04-01 12:20:55 -07:00
Wayne Chen
eba1f271ef
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master 
Case 21892: Mac Audio Push To Talk fix
 2019-04-01 12:19:10 -07:00
NissimHadar
10d1b54241 Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable 2019-04-01 11:57:12 -07:00
Wayne Chen
0a8d195f6f adding top padding for my name card 2019-04-01 11:32:52 -07:00
Wayne Chen
0d83e622ff Revert "Attempt to add acceleration curve." (#23) 
This reverts commit 9ea476ea89.
 2019-04-01 13:47:49 -04:00
NissimHadar
670fb017f3 Moved API call to Test interface. 2019-04-01 10:29:31 -07:00
Seth Alves
58605161e8 cooperate, rather than fight with, Linux window managers 2019-03-31 11:17:11 -07:00
Brad Davis
58abfb44c4 Globally disallow use of the camera or microphone by hosted web content 2019-03-31 11:14:29 -07:00
Saracen
90e979bda7 Add option to disable triggering an away state when interface 
focus is lost.
 2019-03-31 18:44:16 +01:00
Wayne Chen
c4cccc6ef7
fix opacity for containing mouse only 2019-03-29 17:04:44 -07:00
Shannon Romano
dbecf1f611
Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing 
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
 2019-03-29 17:04:37 -07:00
NissimHadar
303dabd93c Added Script command to test if GPU memory size is stable. 2019-03-29 15:46:43 -07:00
Wayne Chen
426ffe5a14
Fixing typo 2019-03-29 15:38:42 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
David Rowe
dff013128e Text improvements and typos 2019-03-30 10:09:48 +13:00
David Rowe
da45b4db38 Add further Audio API examples 2019-03-30 09:51:02 +13:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements 
Avatar hero zone improvements
 2019-03-29 10:49:06 -07:00
Wayne Chen
2622408792 warn when muted only affects hmd 2019-03-29 10:45:40 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
David Rowe
5c8d89fb12 Fill in and tidy Audio API JSDoc 2019-03-29 18:53:30 +13:00
Angus Antley
55b42946a4 cleaned up ugly brace style in json 2019-03-28 19:07:01 -07:00
Thijs Wenker
7e21a3f372 disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx) 2019-03-29 01:48:57 +01:00
Thijs Wenker
687409b756 ignore case for .fbx file extension in AvatarDoctor 2019-03-29 01:46:57 +01:00
Angus Antley
ab1fb0f376 added js doc info for overrideHandAnimation() and restoreHandAnimation in MyAvatar.h 2019-03-28 17:45:23 -07:00
David Back
1e4a6a7cd8 fix delete key doing ctrl + delete in hmd 2019-03-28 16:46:26 -07:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
Wayne Chen
3241d2f960 don't allow clicking on push to talk in MicBarApplication 2019-03-28 16:24:37 -07:00
Wayne Chen
f2b0e47c39 changing opacity 2019-03-28 16:19:35 -07:00
NissimHadar
171aebd6aa Remove disabling of --url for Android. 2019-03-28 13:04:16 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
 2019-03-28 12:01:24 -07:00
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -07:00
Wayne Chen
8627a92f29 adding functions to update variables 2019-03-28 11:29:34 -07:00
Angus Antley
d963ec3005 can now override the eye rotation when procedural eye movement is turned off 2019-03-28 11:27:26 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes 
Fix Flow touch and scale issues
 2019-03-28 11:11:08 -07:00
Oren Hurvitz
32406b8399 Fixed Safe Landing interaction with Local entities. 
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.

For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
 2019-03-28 18:54:14 +01:00
Wayne Chen
c3e5c49f69
update muted in AudioScriptingInterface 2019-03-28 10:40:39 -07:00
Wayne Chen
9349514ff7 make audio screen inputs/outputs unflickable 2019-03-28 10:35:28 -07:00
Oren Hurvitz
7a8b7c095b Fixed a race condition related to the keyboard when starting Interface. 
These two things need to happen in the following order:
1. Initialize the input plugins (including the keyboard)
2. Start the scripts

That's because the scripts try to use the keyboard (e.g., in edit.js), and if it's not ready yet
then they fail, and then Interface doesn't work right (e.g., the Create button doesn't work).

In order to ensure that these things happen in the correct order, we must make sure that
resumeAfterLoginDialogActionTaken() (which starts the scripts) is called only after everything
else in the Interface constructor has finished. Usually this happens correctly, but occasionally
resumeAfterLoginDialogActionTaken() is called too soon. This commit makes sure that even in that
case, we'll postpone calling resumeAfterLoginDialogActionTaken() until the Interface constructor
has finished.
 2019-03-28 13:36:41 +02:00
Oren Hurvitz
49165056c9 Fixed a race condition that sometimes caused the main menus not to appear. 
When Interface starts, it first calls pauseUntilLoginDetermined(), and later resumeAfterLoginDialogActionTaken().
But on rare occasions these functions are called in the reverse order, and this caused Interface to remain
in the "paused" state. Now we check for this case, and abort pauseUntilLoginDetermined() if it happens.

This has only happened to me when running Interface immediately after rebuilding it (in Release mode).
 2019-03-28 11:44:12 +02:00
Oren Hurvitz
8e201f4801 Fixed race condition during initialization of the Desktop. 
The Application constructor must setup event handlers for events emitted when the Desktop is
constructed *before* calling initializeUi(). Otherwise, sometimes these event handlers won't
be called.

When this problem happened (usually on slow machines), Interface would start but neither the
Desktop nor the Login Screen would appear.
 2019-03-28 11:44:12 +02:00
danteruiz
d9b522d10c remove error file 2019-03-27 16:43:03 -07:00
danteruiz
40d424a01d avatar fading 2019-03-27 16:42:34 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Howard Stearns
3da66dacc9 Merge branch 'master' of github.com:highfidelity/hifi into ddv-all 2019-03-27 15:08:03 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control 
Case 21902: System-wide independent volume controls
 2019-03-27 13:19:30 -07:00
Angus Antley
d71c6c28de added the new hand anims to the resource, and added hand reset to initAnimGraph 2019-03-27 12:00:50 -07:00
Sam Gondelman
2005293b3f
Merge pull request #15269 from sethalves/audio-loopback-button-is-local 
case 21932: the test-audio button causes a local audio-loopback rather than a server one
 2019-03-27 10:54:57 -07:00
Simon Walton
6b21fc1af7 Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements 
Fix jsdoc conflict, also minor clean-up.
 2019-03-27 10:54:49 -07:00
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged 
Updated engine code to not emit if dominant hand isn't actually changed
 2019-03-27 10:53:00 -07:00
Andrew Meadows
fb7daa185d improved physics for grabbed AvatarEntities 2019-03-27 10:12:59 -07:00
Seth Alves
e085a00256 cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394 refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term 2019-03-27 10:12:58 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables. 
allow grabbing / adjusting others' wearables if they are unlocked.
 2019-03-27 10:12:57 -07:00
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID 
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
 2019-03-27 09:11:36 -07:00
Angus Antley
02d9331603 This changes the avatar-animation json so that we have override 
animations for the right and left hand, similar to how we have whole
body override animations.
 2019-03-26 23:27:54 -07:00
howard-stearns
bf1982564c pass id around instead of relying on latest ivar value in a singleton 2019-03-26 19:26:38 -07:00
Howard Stearns
57da21cec2 more about challenges use entity id as id, not cert id 2019-03-26 17:12:28 -07:00
Seth Alves
16f842b2ac missed one 2019-03-26 16:07:18 -07:00
Seth Alves
7d21222232 the test-audio button causes a local audio-loopback rather than a server one 2019-03-26 16:03:56 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222 
Case 21222: Agent, Avatar, and MyAvatar JSDoc
 2019-03-26 15:43:32 -07:00
Howard Stearns
c9b79b24e3 track nonces by entity id instead of by cert 2019-03-26 15:23:13 -07:00
Howard Stearns
4dfd0fbda3 challenge ownership packet has an id that gets reflected back. It doesn't have to be a cert. 2019-03-26 15:02:13 -07:00
Brad Davis
413091fed3 Trace application notification handler events if longer than 2 ms 2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
Wayne Chen
c0b71150ea removing an extra button 2019-03-26 10:58:04 -07:00
Wayne Chen
e44cdb0d7b
Merge branch 'audio-mixer-volume-control' into addNewAudioControls 2019-03-26 10:39:29 -07:00
Wayne Chen
a2d754cebd fixing audio screen with master 2019-03-26 10:26:29 -07:00
Ken Cooke
7b56bef838 Prototype an updated Audio tab with 3 independent volume controls 2019-03-26 09:41:58 -07:00
Ken Cooke
c15813b442 Cleanup 2019-03-26 09:38:50 -07:00
Ken Cooke
155bd39da6 Quantize and limit the local injector gains to match the network protocol 2019-03-26 09:38:50 -07:00
Ken Cooke
37429a07b8 Add local injector gains to the Audio scripting interface 2019-03-26 09:38:50 -07:00
Ken Cooke
a2d261d20c Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-26 09:38:07 -07:00
Wayne Chen
060932ad4b fixing typo 2019-03-26 09:13:10 -07:00
Wayne Chen
c54e8f5569 showing ptt text always + hmd mode switch fix 2019-03-25 17:32:03 -07:00
Howard Stearns
02129e0543 no-op refactor in prep for multiple entities per cert 2019-03-25 16:14:48 -07:00
Wayne Chen
6aebd000d6 changing api to match verbiage of overall code 2019-03-25 15:41:03 -07:00
Wayne Chen
49ce30d536 adding changes to design + truly separating muted/ptt 2019-03-25 15:35:05 -07:00
Thijs Wenker
0173c87695 Fix clashing hyperlinks in AvatarPackager project page 2019-03-25 22:48:30 +01:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
Shannon Romano
16d791703d
Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs 
Case 21353: Avatar Doctor documentation / Video URLs
 2019-03-25 14:36:30 -07:00
David Rowe
4a832be8c6 Fix JSDoc post-merge 2019-03-26 10:03:30 +13:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
839a03ebe6 Miscellaneous JSDoc fixes noticed in passing 2019-03-26 09:41:07 +13:00
David Rowe
b78ae80ae6 Address review comments and add further examples 2019-03-26 09:40:47 +13:00
Wayne Chen
9a8c5e5a54
Merge branch 'master' into newAudioMuteStates 2019-03-25 13:33:24 -07:00
Shannon Romano
6710cd3e03
Merge pull request #15233 from roxanneskelly/Case20407 
Case 20407 - Pay-In API doesn't display error when no username specified
 2019-03-25 12:41:57 -07:00
Wayne Chen
59a420b160 adding signals + slots to when muted + display mode changes 2019-03-25 12:24:13 -07:00
Andrew Meadows
cd2dbbb955 fix logic typo 2019-03-25 11:52:52 -07:00
Wayne Chen
f551d49f4f adding signal for updating push to talk variables 2019-03-25 11:32:08 -07:00