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
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
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
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
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
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
David Rowe
5c8d89fb12
Fill in and tidy Audio API JSDoc
2019-03-29 18:53:30 +13: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
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
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
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
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
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
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
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
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
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
Andrew Meadows
cd2dbbb955
fix logic typo
2019-03-25 11:52:52 -07:00
Wayne Chen
7f5d9cbd40
adding push to talk fix for loadData
2019-03-25 11:32:08 -07:00
r3tk0n
3ac42e69e3
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-25 11:27:31 -07:00
Wayne Chen
e9253a630b
Merge pull request #15211 from wayne-chen/fixAudioSettingsScreen-master
...
Case 21781: show up audio screen using Settings > Audio
2019-03-25 11:25:42 -07:00
Wayne Chen
0676e4de5c
Merge pull request #15165 from wayne-chen/fixMuteStateWarning-master
...
Case 21684: Microphone is still live after reopening Interface
2019-03-25 11:14:29 -07:00
Simon Walton
d7a1ecdbb3
Expose hero-status to scripts
2019-03-22 17:19:39 -07:00
Wayne Chen
3ea45de7c7
fixing qml bug in MicBar
2019-03-22 16:37:23 -07:00
Andrew Meadows
55b3b5034a
always update OwingAvatarID of AvatarEntities
2019-03-22 15:47:13 -07:00
Wayne Chen
390ce9bb26
wip for getting AvatarInputsBar to switch accordingly
2019-03-22 15:34:06 -07:00
Wayne Chen
0edbf12fa3
removing extra onLevelChanged
2019-03-22 15:26:57 -07:00
Wayne Chen
ee1a14505a
adding constants, removing entity creation in cpp
2019-03-22 14:54:15 -07:00
Wayne Chen
d0116abc52
separating out bubble icon qml - adding support for transparency
2019-03-22 14:54:13 -07:00
Wayne Chen
8e6913dde1
staging avatar inputs for ignore radius
2019-03-22 14:50:14 -07:00
Wayne Chen
f80f4b2fd4
adding working bubble icon
2019-03-22 14:50:13 -07:00
Wayne Chen
20e181cd82
staging avatar inputs for ignore radius
2019-03-22 14:42:51 -07:00
Wayne Chen
49c3dfa52c
fixing typos
2019-03-22 14:33:54 -07:00
Wayne Chen
3b6c0b5b18
adding privacy shield files
2019-03-22 14:33:54 -07:00
Wayne Chen
77b7cc2457
separating out bubble icon qml - adding support for transparency
2019-03-22 14:16:29 -07:00
Wayne Chen
811fa8dcb2
allowing bubble icon to toggle
2019-03-22 14:16:28 -07:00
Wayne Chen
d382893e75
staging avatar inputs for ignore radius
2019-03-22 14:16:28 -07:00
Wayne Chen
e1d03a2339
fixing typos
2019-03-22 14:16:27 -07:00
Wayne Chen
3be44e0a8e
adding privacy shield files
2019-03-22 14:16:27 -07:00
Wayne Chen
3ceb1598f6
adding working bubble icon
2019-03-22 14:16:27 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit
...
Case 21756: Entities.emitScriptEvent works now
2019-03-21 18:05:17 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
...
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
Shannon Romano
212f02598c
Merge pull request #15231 from AndrewMeadows/fix-vanishing-avatar-entities
...
Case 21838: fix vanishing avatar entities for 0.82.0
2019-03-21 17:39:11 -07:00
Shannon Romano
659aa6f82c
Merge pull request #15238 from robin-k-wilson/fixAvatarBookmarksDeleteBookmark
...
Remove deleteBookmark function call from AvatarBookmarks
2019-03-21 17:35:03 -07:00
r3tk0n
4301d74df5
Fix flying bug.
2019-03-21 16:53:53 -07:00
r3tk0n
108e8b9994
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf
Fix run speeds.
2019-03-21 15:06:21 -07:00
Andrew Meadows
206792f851
don't queue AvatarEntity messages when not in domain
2019-03-21 15:00:11 -07:00
Shannon Romano
33e73953eb
Merge pull request #15163 from danteruiz/fix-laser-scaling
...
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
2019-03-21 13:13:18 -07:00
r3tk0n
543d53ecde
Add ability to toggle strafing.
2019-03-21 13:12:15 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui
...
Case 21771: Possible Entity Scipt Ban Incident
2019-03-21 13:10:54 -07:00
NissimHadar
f7ad5a4d3c
Merge pull request #15160 from NissimHadar/21675-removeGetOperatingSystemTypeFromTestClass
...
Case 21675: removed redundant method.
2019-03-21 12:28:37 -07:00
Robin Wilson
c777f94231
remove AvatarBookmarks.deleteBookmark function
2019-03-21 11:12:30 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025
...
Case 21025 conditionalizing TabletWebView features
2019-03-20 14:21:37 -07:00
Andrew Meadows
9d11e44b4b
update AvatarEntity trait when parentID changes
2019-03-20 11:37:16 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393
...
Case20393 - Add item counts to interface categories
2019-03-19 17:53:30 -07:00
milad
6ed4937dc0
Updated engine code to not emit if dominant hand isn't actually changed
2019-03-18 10:12:32 -07:00
Wayne Chen
db22fa9eec
show up audio screen using Settings > Audio
2019-03-18 09:23:17 -07:00
danteruiz
2ab8eb98e8
better implementation
2019-03-17 14:00:41 -07:00
Thijs Wenker
b5a45be7b9
avatar doctor documentation urls
2019-03-16 02:09:00 +01:00
SamGondelman
d4e1ec9741
fix emitScriptEvent
2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef
fix wearable duplication on domain switch
2019-03-15 13:38:25 -07:00
Roxanne Skelly
9182db8bd4
Case 21025 conditionalizing TabletWebView features
2019-03-15 12:56:43 -07:00
r3tk0n
38fe22e4f7
Fix compiler error for Linux.
2019-03-14 16:27:40 -07:00
luiscuenca
c14b135f2b
Fix flow touch and scale issues
2019-03-13 15:42:04 -07:00
David Rowe
74edea8034
Miscellaneous JSDoc fixes
2019-03-14 10:25:31 +13:00
David Rowe
277ef56f49
Fill in JSDoc for new flow functions
2019-03-14 10:24:19 +13:00
SamGondelman
300dd39abf
fix script engine shutdown
2019-03-13 12:23:31 -07:00
Roxanne Skelly
2dc38df779
Case 20393 - Display item counts in categories dropdown in Marketplace
2019-03-13 10:17:39 -07:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e
try to fix audio injector threading issues
2019-03-12 18:41:43 -07:00
Wayne Chen
186588ddc4
set audio client muted when loaded data
2019-03-12 15:27:02 -07:00
danteruiz
6303f61cc3
fix lasers scale issue
2019-03-12 14:26:59 -07:00
NissimHadar
41662b183b
Removed redundant method.
2019-03-12 10:45:04 -07:00
r3tk0n
6ce955d915
Fix hand-relative movement after hand dominance notion swap.
2019-03-11 18:19:43 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt
2019-03-11 17:09:37 -07:00
r3tk0n
39342b9771
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-11 16:27:05 -07:00
r3tk0n
ce2e0c7b81
Merge branch 'project-freeloco' of https://github.com/r3tk0n/hifi into project-freeloco
2019-03-11 16:25:13 -07:00
r3tk0n
cbd841a14d
Update gearing system.
2019-03-11 16:22:48 -07:00
Jason Najera
3c5fd06959
Remove useless comment.
...
Comment was not helpful.
2019-03-11 16:16:58 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified
2019-03-11 14:35:13 -07:00
Wayne Chen
07ddd4e1dd
moving key press detection to JSON
2019-03-11 14:27:47 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero
...
Case 21639: RC81: Adding Hero support in simulation of avatars
2019-03-11 14:13:49 -07:00
Wayne Chen
7b51061b5f
fixing initialization in switch statement
2019-03-10 19:46:01 -07:00
Wayne Chen
20487b2ad1
connecting pushingToTalkChanged with handlePushedToTalk
2019-03-10 19:39:45 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt
2019-03-10 17:14:54 -07:00
r3tk0n
04c6c42512
Fix build error from merge.
2019-03-10 14:28:31 -07:00
David Rowe
24286273b4
Miscellaneous JSDoc fixes
2019-03-09 19:22:07 +13:00
Sam Gateau
3464fe09c1
Applying the hero changes to master soon to be rc81
2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra
...
add getFlowData method to MyAvatar
2019-03-08 17:45:11 -08:00
Wayne Chen
e0fe11056e
fixing compile error
2019-03-08 16:37:41 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified
...
Case 21562: Audio settings screen
2019-03-08 16:22:52 -08:00
Wayne Chen
d46074d43f
Merge branch 'ptt' into pushToTalk
2019-03-08 16:09:58 -08:00
Wayne Chen
48d1ec850c
removing debug statement
2019-03-08 16:07:48 -08:00
Wayne Chen
18b86d550d
adding PushToTalk action
2019-03-08 16:07:48 -08:00
Wayne Chen
f4db9fefd0
Push to talk changes + rebased with master ( #7 )
...
Push to talk changes + rebased with master
2019-03-08 16:06:46 -08:00
r3tk0n
88a125aff0
Initial implementation (deadlocks still occurring in Audio.cpp)
2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1
updating compile failure + icons/settings update
2019-03-08 16:02:15 -08:00
Wayne Chen
a688c0a92b
exposing setting pushingToTalk
2019-03-08 16:02:15 -08:00
Wayne Chen
60b98d2c70
Push to talk changes + rebased with master ( #7 )
...
Push to talk changes + rebased with master
2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e
laying groundwork for audio app + fixing deadlocks
2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9
Initial implementation (deadlocks still occurring in Audio.cpp)
2019-03-08 16:02:14 -08:00
David Rowe
24c7c8be19
Update JSDoc per merge from master
2019-03-09 12:03:59 +13:00
luiscuenca
df32b61eaf
remove unused variable
2019-03-08 16:01:18 -07:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81
...
Case 21628: Fix text rendering on AMD/Mac
2019-03-08 14:59:37 -08:00
luiscuenca
bfcb1a8391
Make methods thread safe
2019-03-08 15:57:25 -07:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers
...
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
2019-03-08 14:56:56 -08:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings
...
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
2019-03-08 23:51:58 +01:00
Thijs Wenker
06e5927ee1
CR fixes
2019-03-08 23:07:01 +01:00
luiscuenca
4858f64810
get the colliding joints
2019-03-08 14:36:47 -07:00
luiscuenca
cbe920774f
add getFlowData jsdoc
2019-03-08 12:45:29 -07:00
luiscuenca
cb6f573b35
Merge branch 'master' into flowAPIExtra
2019-03-08 12:43:02 -07:00
Roxanne Skelly
c33d2aafda
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-03-08 11:41:34 -08:00
luiscuenca
a977bb6dc8
remove unuse variable
2019-03-08 12:39:57 -07:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
Roxanne Skelly
750dbfae21
Stand-alone Tags: Throw up popup for first unoptimized domain
...
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
2019-03-08 10:48:42 -08:00
luiscuenca
e8da6b5a0c
add getFlowData
2019-03-08 10:36:58 -07:00
Thijs Wenker
f2bca5d6c6
added the multiple root joints warning
2019-03-08 07:32:41 +01:00
Thijs Wenker
c35e4d15ab
- warning grammar / no more texture folder content requirement for No textures assigned warning
...
- resolved partial commit issue / Fix UNIX builds by removal of unused warning
2019-03-08 03:36:56 +01:00
Thijs Wenker
d985d1bff0
use Rig instead of Avatar for height calculations
2019-03-08 03:36:56 +01:00
Thijs Wenker
bcd00f98d0
- added more warnings to the avatar doctor
...
- read embedded fst texture mappings
2019-03-08 03:36:56 +01:00
David Rowe
0b7cddb886
Fill in and tidy MyAvatar JSDoc
2019-03-08 13:49:10 +13:00
SamGondelman
af03fb5f85
try to fix text rendering on amd with transparency
2019-03-07 16:23:12 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo
...
Case 21603: Tablet x button is nearly impossible to hit with stylus
2019-03-07 16:03:13 -08:00
Shannon Romano
76958ffda2
Merge pull request #15102 from danteruiz/keyboard-for-web-entities
...
Case 21144: Can't enter text in a Web Entity with the new keyboard
2019-03-07 15:46:31 -08:00
Shannon Romano
ab08b56bd1
Merge pull request #15085 from danteruiz/keyboard-handle-scaling
...
Case 21500: Keyboard handle appears huge when scaling down avatar
2019-03-07 15:39:43 -08:00
Wayne Chen
472c7ffab4
removing debug statement
2019-03-07 12:54:32 -08:00
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst
...
Load flow bone data from FST file
2019-03-07 12:48:36 -08:00
Wayne Chen
b83e9f70e6
adding PushToTalk action
2019-03-07 12:36:56 -08:00
Wayne Chen
7b197c975c
updating compile failure + icons/settings update
2019-03-07 11:41:19 -08:00
Wayne Chen
0cb9e7eb36
exposing setting pushingToTalk
2019-03-07 11:41:19 -08:00
Wayne Chen
066d1797cf
Push to talk changes + rebased with master ( #7 )
...
Push to talk changes + rebased with master
2019-03-07 11:41:19 -08:00
Wayne Chen
eeb900b761
laying groundwork for audio app + fixing deadlocks
2019-03-07 11:41:19 -08:00
r3tk0n
d8478e0b17
Initial implementation (deadlocks still occurring in Audio.cpp)
2019-03-07 11:41:18 -08:00
danteruiz
9ca3805499
making requested changes
2019-03-07 10:27:16 -08:00
Roxanne Skelly
b38fc65372
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-03-07 10:06:05 -08:00
SamGondelman
380df059ff
fix shapes app
2019-03-06 18:18:39 -08:00
danteruiz
a0bd2f67ec
fix stylus gizmo intersection
2019-03-06 17:20:36 -08:00
SamGondelman
96eb137df2
fix debugAvatarMixer.js
2019-03-06 15:53:25 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master
...
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
2019-03-06 13:06:45 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
...
Case 21340: avatar doctor project page status
2019-03-06 12:36:18 -08:00
luiscuenca
dfb434ea09
Fix warning and refactoring
2019-03-06 09:25:49 -07:00
luiscuenca
76609197e2
Read flow data from the fst file
2019-03-05 18:50:53 -07:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear
...
Case 11775: Don't clear my avatar entities on domain switch
2019-03-05 15:42:51 -08:00
danteruiz
1941e53cc3
track oculus controllers while in oculus home
2019-03-05 15:32:18 -08:00
Roxanne Skelly
3ef02085ff
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
2019-03-05 15:07:49 -08:00
danteruiz
e6a63a9a69
add keyboard for html content
2019-03-05 14:24:38 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create
...
Case 21541: Fix mouse on create in HMD
2019-03-05 13:07:49 -08:00
Shannon Romano
3eff5d269f
Merge pull request #15008 from ctrlaltdavid/M21128-a
...
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
2019-03-05 11:58:37 -08:00
SamGondelman
f2c248c0a2
disable href and entity script events when in edit mode
2019-03-04 17:10:20 -08:00
SamGondelman
12f5a735d9
simplifying mouse events and fix mouse on create
2019-03-04 14:50:09 -08:00
Wayne Chen
4187104b17
culling mute state
2019-03-04 14:12:09 -08:00
Seth Alves
3ecd86caee
add a way to disble muted warning from audio panel.
...
fix positioning of warning. hide warning when removing timer.
2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2
rework audioMuteOverlay.js
2019-03-04 13:47:54 -08:00
Oren Hurvitz
7780db813d
Save the "Mute Microphone" setting
2019-03-04 13:47:54 -08:00
Shannon Romano
45099a5db6
Merge pull request #15076 from SamGondelman/laserWidth
...
Case 21514: Lasers scale with avatar
2019-03-04 11:26:08 -08:00
Seth Alves
38256df0f2
add a way to disble muted warning from audio panel.
...
fix positioning of warning. hide warning when removing timer.
2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753
rework audioMuteOverlay.js
2019-03-04 11:08:06 -08:00
Oren Hurvitz
18325ef5e3
Save the "Mute Microphone" setting
2019-03-04 11:08:06 -08:00
danteruiz
a026933819
keyboard handle scaling
2019-03-04 10:56:14 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation
...
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
2019-03-04 10:49:16 -08:00
Shannon Romano
d56b460d11
Merge pull request #15030 from wayne-chen/clockOnTablet
...
Case 21456, Case 21463: Clock On Tablet (81.0/master)
2019-03-04 10:45:34 -08:00
SamGondelman
da1ffc15e3
lasers scale with avatar
2019-03-01 15:42:45 -08:00
danteruiz
8e600adf1e
making requested changes
2019-03-01 15:30:11 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
...
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
danteruiz
618a1d5b83
fix tablet button and gizmos rotation
2019-03-01 14:31:12 -08:00
SamGondelman
3e6061e435
try to not clear my avatar entities on domain switch
2019-03-01 13:45:00 -08:00
Shannon Romano
20d65ab183
Merge pull request #15064 from danteruiz/another-login-fix
...
Case 21451: HMD Login Encouragement Screen is not Usable
2019-03-01 12:57:17 -08:00
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d
...
Case 19188: Potential 2D overlay + Tablet threading fixes
2019-03-01 12:56:23 -08:00
amer cerkic
6ebc57994b
Merge branch 'master' into quest-demo
2019-03-01 10:23:41 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload
...
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
2019-03-01 09:35:01 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
...
Case 21494: Avoid mem leaked entities
2019-03-01 09:34:20 -08:00
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload
...
Case 21490: Fix lasers and keyboard on reload
2019-03-01 09:31:56 -08:00
danteruiz
7bcf727a83
review changes
2019-02-28 18:11:51 -08:00
danteruiz
9fe0309ae6
another login fix
2019-02-28 17:11:48 -08:00
SamGondelman
b26b02fed6
potential 2d overlay threading fixes
2019-02-28 17:02:08 -08:00
Andrew Meadows
7d9efe4c09
avoid mem-leak for serverless domains
2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo
2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097
fix lasers and keyboard on reload
2019-02-28 14:04:22 -08:00
SamGondelman
a8e6d01279
fix context overlay
2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37
removing quest-demo specific changes
2019-02-28 10:54:30 -08:00
amer cerkic
a425becc8a
clean up of debugging
2019-02-27 15:35:33 -08:00
Shannon Romano
1a83ab2dab
Merge pull request #15038 from danteruiz/fix-login-screen
...
Case 21451: HMD Login Encouragement Screen is not Usable
2019-02-27 14:41:41 -08:00
David Rowe
d73ff2e855
Revise current MyAvatar API JSDoc
2019-02-28 10:40:10 +13:00
amer cerkic
92cfa49bfb
adding and testing command line parameter passing to application
2019-02-27 11:42:22 -08:00
SamGondelman
bf9e5b9550
comment out another log
2019-02-27 10:25:34 -08:00
danteruiz
2fd94c6bbc
fixing login dialog
2019-02-27 10:08:38 -08:00
r3tk0n
42b62ff2d5
Fix Ubuntu compiler warnings.
2019-02-26 19:16:34 -08:00
r3tk0n
a093fe5c4f
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-26 15:08:57 -08:00
r3tk0n
030211aea8
Fix OSX compiler error, init list in wrong order after merge.
2019-02-26 14:46:04 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake
...
case 21411: don't allow others' grabs to move locked or ungrabbable things
2019-02-26 09:03:44 -08:00
nimisha20
ba3895efdd
Update AccountServicesScriptingInterface.h
...
Minor copy-edit
2019-02-25 22:56:36 -08:00
nimisha20
736a050e68
Update AccountServicesScriptingInterface.h
2019-02-25 22:55:56 -08:00
nimisha20
4825ecdbf3
Update AccountServicesScriptingInterface.h
2019-02-25 22:44:16 -08:00
Wayne Chen
650b34c463
adding clock
2019-02-25 18:00:56 -08:00
Shannon Romano
7fe3bb387e
Merge pull request #15012 from SamGondelman/nametag
...
Case 21397: Trying to fix overlay rotation
2019-02-25 16:52:01 -08:00
Andrew Meadows
6e13203fec
avoid nullptr deref
2019-02-25 13:52:46 -08:00
r3tk0n
5d3a778b0b
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation
2019-02-25 13:10:47 -08:00
SamGondelman
e102ad073e
allow flying in HMD if you would otherwise fall forever
2019-02-25 11:49:38 -08:00
Seth Alves
db821487d9
don't allow others' grabs to move locked or ungrabbable things
2019-02-25 11:27:10 -08:00
Thijs Wenker
79d0a0a0a8
avatar doctor project status
2019-02-25 19:28:38 +01:00
Roxanne Skelly
2dffd14fa7
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-25 10:20:52 -08:00
SamGondelman
8058ad884e
trying to fix overlay rotation
2019-02-25 09:53:33 -08:00
nimisha20
e20f13f0ae
Update AccountServicesScriptingInterface.h
...
Adding ctrlaltdavid's changes
2019-02-25 09:28:56 -08:00
nimisha20
2bcee4e454
Update AccountServicesScriptingInterface.cpp
...
Changes according to ctrlaltdavid's comments.
2019-02-25 08:54:47 -08:00
David Rowe
4e9d162172
AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
2019-02-24 13:23:20 +13:00
Sam Gateau
4f0911bd29
Merge pull request #15003 from SamGondelman/nametag
...
Case 21397: Fix nametag rotation
2019-02-23 09:00:12 -08:00
SamGondelman
37720e9daa
fix nametag rotation
2019-02-22 16:53:03 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot
...
Case 21354: Add "modelScale" property to fix pal
2019-02-22 16:36:17 -08:00
Sam Gateau
860b3a35e4
Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations
...
Quest demo with avatar ik optimizations
2019-02-22 16:32:24 -08:00
Anthony Thibault
1213084fc6
Merge pull request #14984 from kencooke/master
...
Case 21384: Avatar mouth blendshapes are not working correctly (master)
2019-02-22 16:29:07 -08:00
Roxanne Skelly
0636579822
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-22 15:43:42 -08:00
Dante Ruiz
eedd54d0b1
Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo
2019-02-22 15:02:01 -08:00
Dante Ruiz
a87e49bb23
start in quest dev
2019-02-22 15:01:30 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard
...
Case 21341: Fix billboard mode in secondary camera
2019-02-22 13:01:09 -08:00
amantley
87d98e5b85
These are the squashed commits for the ik optimization for the Quest
...
Implmented using a new AnimSplineIK node in the anim graph
(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
2019-02-22 11:21:36 -08:00
Sam Gateau
1d5a4116b9
Merge pull request #14986 from amerhifi/quest-demo
...
case 21374 : Away mode on Quest when device is paused
2019-02-22 09:54:57 -08:00
amer cerkic
9c833f7e64
clean up
2019-02-22 09:21:51 -08:00
amer cerkic
f04fdb2187
added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user
2019-02-22 09:11:24 -08:00
luiscuenca
3072ca43de
Detailed picking if avatar is not null
2019-02-22 09:24:38 -07:00
Ken Cooke
c1786edc24
Emulate the old behavior of _lastInputLoudness
2019-02-21 18:45:17 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK
...
AnimSplineIK node added to inverse kinematics
2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp
...
Cpp implementation of the Flow script
2019-02-21 17:10:05 -08:00
Sam Gateau
ddc42585d8
Cleanup syntax
2019-02-21 16:41:50 -08:00
Sam Gateau
94fc60f285
Bad idea to include global here
2019-02-21 16:34:50 -08:00
amer cerkic
9097d9c57c
working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.
2019-02-21 16:33:25 -08:00
amantley
3bf5c44f98
fixed build warnings
2019-02-21 16:24:46 -08:00
amantley
5cf8a963cd
make spine2 rotation damping only happen in optimized code. the regular code is already damped
2019-02-21 15:41:16 -08:00
Sam Gateau
fe33aadd69
Assigning the default world detail and max render rate target in vr quest
2019-02-21 14:58:06 -08:00
amantley
c9db426ce4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-21 14:36:13 -08:00
amantley
6323f49f26
changed the define variable to HIFI_USE_OPTIMIZED_IK
2019-02-21 14:36:05 -08:00
SamGondelman
544f54e69a
fix model scale
2019-02-21 14:10:36 -08:00
Roxanne Skelly
258e80237e
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-21 11:54:47 -08:00
r3tk0n
a3c4747290
Add leveled controller-relative movement option.
2019-02-21 11:17:31 -08:00
amantley
afed0b5442
review changes
2019-02-21 11:08:29 -08:00
SamGondelman
4fdf556d5d
fix billboard mode in secondary camera
2019-02-21 10:29:21 -08:00
Angus Antley
b6bc467f4b
added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel
2019-02-21 06:42:55 -08:00
amantley
f8a74efdc2
fixed build errors from jenkins
2019-02-20 17:59:45 -08:00
amantley
27bfe2f0fe
changed name of pre processor variable
2019-02-20 15:14:12 -08:00
Roxanne Skelly
8c058f147e
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-20 14:24:47 -08:00
Dante Ruiz
bf8c671cd6
keyboard setting
2019-02-20 13:38:20 -08:00
Brad Davis
79369a0c83
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-20 10:40:49 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables
...
Case 21300, Case 21301: Group cull all entity descendants of avatars
2019-02-20 10:29:40 -08:00
John Conklin II
97c7b01005
Merge pull request #14965 from danteruiz/stylus-pick-perf
...
Case 21255: PickManager performance is slow when keyboard mallets are enabled
2019-02-20 10:11:33 -08:00
Brad Davis
817c24dd0b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-20 09:51:03 -08:00
r3tk0n
7092513b7d
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-19 17:42:58 -08:00
Brad Davis
122a246d2d
Fix typo
2019-02-19 17:30:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal
...
Case 21259: Pal textures don't change
2019-02-19 17:14:15 -08:00
Brad Davis
518e480a8b
Fix plugin activation
2019-02-19 17:00:50 -08:00
SamGondelman
6765268998
Merge remote-tracking branch 'upstream/master' into wearables
2019-02-19 16:52:00 -08:00
luiscuenca
04e57d0dd1
No Rig pointer on Flow class, solve network animations and fixed bug
2019-02-19 17:45:46 -07:00
danteruiz
6bdf51a460
limit number of include items for mallets
2019-02-19 16:25:38 -08:00
danteruiz
d1c46e1cdc
fixing tablet pointer issues
2019-02-19 14:48:17 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf
...
Case 21271: Remove unnessary picks for quest
2019-02-19 14:20:56 -08:00
Brad Davis
d60dcb99d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-19 12:37:30 -08:00
Roxanne Skelly
d957b38f10
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-19 12:34:10 -08:00
r3tk0n
ebbf48a11b
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-19 12:02:50 -08:00
SamGondelman
2986ca20c5
Merge remote-tracking branch 'upstream/master' into pal
2019-02-19 11:31:40 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick
...
Case 21291, Case 21292, Case 21293: Working on overlay bugs
2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity
...
Case 20920: Move Material Entity logic to render thread
2019-02-19 10:59:51 -08:00
danteruiz
4bbae1230d
making requested chantges
2019-02-19 10:07:36 -08:00
SamGondelman
927e824610
fix missing color for text overlays
2019-02-18 16:14:07 -08:00
David Rowe
f58a5db0b0
Reorganize JSDoc inheritance for MyAvatar and Avatar
2019-02-19 09:47:51 +13:00
Angus Antley
748368bfda
mid tweak on the wrist and position coeffs
2019-02-17 23:32:52 -08:00
David Rowe
50a1e07ed2
Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc
2019-02-18 18:32:49 +13:00
SamGondelman
06ac2b291b
attachments and wearables cull with avatar parent
2019-02-17 17:52:10 -08:00
SamGondelman
1163cbea70
improving web surface interaction and tablet hiding
2019-02-16 22:03:55 -08:00
SamGondelman
85421cd6ee
speed up stylus picks
2019-02-16 21:16:46 -08:00
SamGondelman
71653f95d7
working on overlay bugs
2019-02-16 20:08:36 -08:00
Angus Antley
70764bc3c4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-15 19:24:30 -08:00
amantley
d78f253d24
code to generate pole vector from theta
2019-02-15 17:43:53 -08:00
danteruiz
b00746c096
Trim picks in use during quest:
2019-02-15 16:24:17 -08:00
SamGondelman
0f33d696d2
trying to fix pal colors
2019-02-15 16:12:36 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
...
Case 21012: Avatar Doctor
2019-02-15 15:43:18 -08:00
amantley
36093926d0
added fake android defines for running the new ik on pc
2019-02-15 15:00:39 -08:00
Thijs Wenker
e900d3784b
fixes
2019-02-15 23:58:42 +01:00
SamGondelman
3df231f1e0
it's working!
2019-02-15 14:43:22 -08:00
ingerjm0
c8791841de
Merge pull request #14918 from ctrlaltdavid/M21128
...
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
2019-02-15 14:15:13 -08:00
Brad Davis
78be935e1a
Consolidating differences from master
2019-02-15 14:12:37 -08:00
Brad Davis
4409e59682
Add per-android-app preprocessor macros
2019-02-15 14:11:26 -08:00
Roxanne Skelly
a82385200e
Merge pull request #14906 from roxanneskelly/QmlMarketplace
...
Qml marketplace - multiple improvements/bugfixes
2019-02-15 14:04:47 -08:00
John Conklin II
b9356e22d8
Merge pull request #14927 from huffman/fix/hide-asset-browser
...
Case 16349: Fix asset browser being hidden in incorrect way on server switch
2019-02-15 13:32:27 -08:00
SamGondelman
c92b82e744
merge with master
2019-02-15 12:43:30 -08:00
Thijs Wenker
74ce98a075
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16
Better scale and texture checks
2019-02-15 20:55:27 +01:00
SamGondelman
87ab255115
finish moving materials to rendering
2019-02-15 11:49:20 -08:00
Brad Davis
a5f84ab51a
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 11:37:13 -08:00
Roxanne Skelly
fb524f8900
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-15 11:35:06 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Roxanne Skelly
be98fb1ac7
Standalone Tags - checkpoint
2019-02-15 11:21:40 -08:00
SamGondelman
25b31cfc72
merge with master
2019-02-15 11:08:24 -08:00
amantley
0fcaa695ba
Merge remote-tracking branch 'upstream/master' into animArmIK
2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f
adding ifdef for android os
2019-02-15 10:35:25 -08:00
Brad Davis
0b171ffe13
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 10:31:04 -08:00
Anthony Thibault
702f1c8e74
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
...
Revert anim pose optimization
2019-02-15 09:42:27 -08:00
luiscuenca
c966f71cb1
More fixes
2019-02-15 10:17:37 -07:00
luiscuenca
98c321c718
Fix warnings
2019-02-15 09:40:49 -07:00
amantley
425413419a
fixed merge conflict in avatar.h
2019-02-15 08:26:54 -08:00
Ryan Huffman
ab5c4a927b
Fix asset browser being hidden in incorrect way on server switch
2019-02-14 22:18:42 -08:00
luiscuenca
624a53449f
Merge branch 'master' into flowCpp
...
# Solved Conflicts:
# interface/src/avatar/MyAvatar.cpp
2019-02-14 18:55:43 -07:00
luiscuenca
88eae0f2ec
Remove test functions
2019-02-14 18:49:49 -07:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode
...
Case 20962: Billboard mode improvements
2019-02-14 17:44:48 -08:00
Shannon Romano
3b5b077a3e
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
...
Case 21066: restore shape caching in ShapeManager
2019-02-14 17:33:33 -08:00
luiscuenca
3e66bce112
set useFlow function
2019-02-14 18:30:37 -07:00
Anthony Thibault
a3407b96b0
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
2019-02-14 16:56:17 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
...
Case 21159: fixes for more grab bugs
2019-02-14 16:52:03 -08:00
Anthony Thibault
39b4eaac34
Revert "AnimPose operator* optimizations"
...
This reverts commit 569bef50fd
.
2019-02-14 16:13:00 -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
Brad Davis
292602afd7
Resolving more master differences
2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-14 12:49:56 -08:00
David Rowe
6a00834147
Merge branch 'master' into M21128
...
# Conflicts:
# interface/src/AboutUtil.h
2019-02-15 08:06:41 +13:00
David Rowe
d717e803dd
WalletScriptingInterface API JSDoc
2019-02-15 08:00:53 +13:00
David Rowe
cc083afec6
HifiAbout API JSDoc
2019-02-15 08:00:36 +13:00
David Rowe
2a338124ae
AccountServices API JSDoc
2019-02-15 08:00:19 +13:00
Thijs Wenker
3026fd625a
Avatar Doctor
2019-02-14 18:52:50 +01:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475
CR and fix deadlock
2019-02-13 16:19:39 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132
...
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
2019-02-13 10:35:00 -08:00
Andrew Meadows
c79e3e5a6d
add some trace contexts for easier debugging
2019-02-13 10:02:58 -08:00
Andrew Meadows
152edd477c
change trace context to rendering
2019-02-13 10:00:51 -08:00
Shannon Romano
07a92aea95
Merge pull request #14894 from AndrewMeadows/update-collision-group-after-grab
...
Case 21093: recompute collision group/mask when Grab ends
2019-02-12 17:31:43 -08:00
Andrew Meadows
8bdac589b8
use RingBuffer for gradual garbage collection
2019-02-12 15:37:09 -08:00
Brad Davis
4dd853ddbc
Cleanup from master
2019-02-12 15:14:50 -08:00
Brad Davis
db121957d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-12 15:00:03 -08:00
Andrew Meadows
ed8481ead9
fix grab bugs
2019-02-12 14:04:56 -08:00
luiscuenca
954cac907d
Other avatars after update and mod timer when active
2019-02-12 15:02:56 -07:00
Shannon Romano
e8c70cc782
Merge pull request #14897 from danteruiz/fix-soft-entity
...
Case 21142: Wearer and observer disagree on whether a worn item is correctly placed
2019-02-12 13:56:47 -08:00
Roxanne Skelly
a82221d2a5
Case 21118 - descending sorts don't work in new (qml) marketplace
2019-02-12 13:20:47 -08:00
Andrew Meadows
3ea6241cc9
send update for AvatarEntity on deleteGrab
2019-02-12 12:50:47 -08:00
Sam Gateau
a10cf9b620
Merge pull request #14883 from amerhifi/feature/quest
...
case:21032 Fixing Lifecycle of the android app
2019-02-12 12:32:38 -08:00
danteruiz
fdfb9196d3
comments explaining horrible code
2019-02-12 11:45:08 -08:00
Brad Davis
a6f23f48d6
Merge branch 'feature/quest_custom_plugins' into feature/quest
2019-02-12 09:53:12 -08:00
luiscuenca
942e9ccdfd
Hand collisions working
2019-02-11 18:21:00 -07:00
danteruiz
a7e28f7a66
fix spatially nestable parent overwrite
2019-02-11 17:04:07 -08:00
danteruiz
50dd865bdc
fix spatially nestable parent overwrite
2019-02-11 16:48:34 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
Andrew Meadows
fab3e5e3fd
remember hash of AvatarEntityItemData
2019-02-11 16:13:56 -08:00
Brad Davis
e534270f9a
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
2019-02-11 15:41:32 -08:00
SamGondelman
96f32a9f72
fix keyboard focus thing
2019-02-11 15:17:32 -08:00
SamGondelman
f53ccf7363
fix create, working on mini tablet
2019-02-11 14:54:53 -08:00
David Rowe
5428bb19dc
Add "Avatar Script" JSDoc API classification
2019-02-12 11:49:49 +13:00
r3tk0n
bdafb99402
Remove unused variable and function to address warnings in Mac and Linux builds.
2019-02-11 14:19:15 -08:00
SamGondelman
d988de4a17
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
a23f436a9f
Merge pull request #14880 from kencooke/audio-meter-improvements
...
Case 21091: Improved audio metering
2019-02-08 19:08:31 -08:00
amantley
822ec1c529
working on the wrist tweak, dampened the spine twist
2019-02-08 17:53:23 -08:00
Roxanne Skelly
74f8615fb7
Merge pull request #14876 from roxanneskelly/QmlMarketplace
...
Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available
2019-02-08 15:04:35 -08:00
Sabrina Shanman
baf72eaae0
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints
...
Case 20887: Move FST joint property handling to the model preparation step
2019-02-08 15:02:23 -08:00
John Conklin II
f9b86725fd
Merge pull request #14816 from SamGondelman/avatar
...
Case 20924: Cleaning up Avatar findRayIntersection
2019-02-08 14:40:45 -08:00
Roxanne Skelly
93665fa501
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-08 14:21:29 -08:00
amerhifi
e8a35c63c7
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
2019-02-08 13:45:53 -08:00
Anthony Thibault
d012d07519
Merge pull request #14865 from hyperlogic/feature/anim-optimizations
...
Animation System Optimizations
2019-02-08 12:44:10 -08:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
Roxanne Skelly
e6b2c890d0
Case21085 - Changing domains with scripting APIs not working
...
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.' Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
2019-02-07 22:21:05 -08:00
Ken Cooke
b04a59af1b
Calibrate meter to encourage hotter mic levels
2019-02-07 16:31:25 -08:00
Ken Cooke
2617febbcd
Replace ad-hoc audio meter with meter calibrated in dBFS
2019-02-07 15:31:13 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15: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
SamGondelman
c217f8d80f
remove overlay picks from stats qml
2019-02-07 14:25:07 -08:00
Brad Davis
070fb25b80
Cleaning up differnces from master
2019-02-07 13:33:28 -08:00
SamGondelman
3addcb630c
Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping
2019-02-07 11:45:59 -08:00
danteruiz
95d30e5cbf
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
2019-02-07 10:41:44 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
Ken Cooke
ba00f95f72
Expose clipping status to audio scripting interface
2019-02-06 18:23:50 -08:00
SamGondelman
a665664fd5
fix double lasers
2019-02-06 16:13:40 -08:00
SamGondelman
b1e7c3d4fd
allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel
2019-02-06 16:04:40 -08:00
Shannon Romano
6fd480e51d
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
...
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
2019-02-06 15:52:31 -08:00
Brad Davis
8b70f1771e
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 13:16:22 -08:00
Shannon Romano
30a6f25b69
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
...
case 20048: don't allow MyAvatar to move until physics enabled
2019-02-06 11:52:42 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace
...
Qml marketplace
2019-02-06 11:20:49 -08:00
Brad Davis
91e18f569b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 10:15:36 -08:00
Sam Gondelman
bc11d80a52
fix create selectionBox wireframe
2019-02-05 23:07:57 -08:00
John Conklin II
ec0bdba7fb
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
...
case 20919: Fix edit in release grab
2019-02-05 14:48:59 -08:00
Anthony Thibault
569bef50fd
AnimPose operator* optimizations
2019-02-05 14:48:05 -08:00
Roxanne Skelly
d3bc536b58
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-05 11:35:28 -08:00
Andrew Meadows
cbd83f972c
remove unsued variable
2019-02-05 10:17:10 -08:00
Roxanne Skelly
2b40260953
QmlMarketplace - disable HTML for quest
2019-02-05 09:27:12 -08:00
Andrew Meadows
e50892b3d2
MyAvatar is unmovable until physics is enabled
2019-02-05 09:00:48 -08:00
Jamil Akram
35c0af0bf3
Merge pull request #14818 from wayne-chen/oculusLoginFeature
...
MS20925: Oculus login button not appearing
2019-02-04 17:20:07 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
SamGondelman
934abb3d52
fix keyboard focus and image overlays
2019-02-04 13:33:03 -08:00
SamGondelman
31cf623252
fix keyboard focus
2019-02-04 12:44:04 -08:00
luiscuenca
cf8f9fa1b6
Threads created correctly
2019-02-04 11:28:42 -07:00
SamGondelman
4b406bf41c
fix getEntityObject and tablet highlighting (Overlays.findOverlays)
2019-02-01 16:23:06 -08:00
SamGondelman
391cca787f
fix keyboard textures and text display
2019-02-01 15:33:53 -08:00
SamGondelman
ba8320f561
fix 2d overlay deletion
2019-02-01 14:31:26 -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
amantley
61b019d176
added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files
2019-01-31 14:13:51 -08:00
Dante Ruiz
9082a3f4e5
to the spot on first launch
2019-01-31 10:58:20 -08:00
Dante Ruiz
778ddad9ac
to the spot on first launch
2019-01-31 10:52:48 -08:00
amantley
ffd374e7d4
whitespace
2019-01-31 10:05:08 -08:00
amantley
f68ee4e7ce
merged with master
2019-01-31 09:56:46 -08:00
SamGondelman
2d0c1184e4
only domain zone entities control flying and ghosting
2019-01-30 18:27:17 -08:00
amantley
7a1c1252ff
cleanup
2019-01-30 16:09:10 -08:00
SamGondelman
6cbc0fad7f
fixes
2019-01-30 15:58:15 -08:00
Wayne Chen
03789e01da
adding fix for oculus store argument check
2019-01-30 15:53:21 -08:00