Roxanne Skelly
a7595496f6
CR fixes
2019-05-14 16:39:39 -07:00
Zach Fox
e3bec7ef2a
CR Round 1 - thanks Milad
2019-05-14 16:29:03 -07:00
Roxanne Skelly
fad7fa4c07
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 16:25:10 -07:00
Simon Walton
e768beb9b1
Allow for delayed challenges if salt is empty
2019-05-14 15:53:35 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives
...
Case 19510: Unify cube and sphere edit menu entries into one.
2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296
Reduce size of output muted overlay; restore scroll to 0 on settings tab switch
2019-05-14 15:05:26 -07:00
David Rowe
997dc963d3
Merge branch 'master' into M22147
2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1
Doc review
2019-05-15 07:56:55 +12:00
Zach Fox
f43c376a6a
Tweak top bar
2019-05-14 12:41:56 -07:00
Zach Fox
8724cf4edf
UIT TextField
2019-05-14 12:27:33 -07:00
Zach Fox
2080aa6676
Some fun motion for experimentation
2019-05-14 11:56:07 -07:00
Zach Fox
cf46f3c9d4
CheckBox UIT and CheckBox added to Avatar app
2019-05-14 11:50:07 -07:00
Roxanne Skelly
68fb43ec7f
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 10:11:02 -07:00
amerhifi
fe6b2fceed
addressing comment in pr. removing extra space added in previous checkin
2019-05-14 09:39:44 -07:00
Zach Fox
c57ddf969a
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
2019-05-14 09:32:07 -07:00
amerhifi
a5f4664001
Merge branch 'master' into feature/platform
2019-05-14 09:27:15 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam
...
BUGZ-131: Additional silencing of watchdog spam
2019-05-14 08:10:02 -07:00
amerhifi
2a6dc53395
Merge branch 'master' into feature/platform
2019-05-14 06:18:37 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList
...
Call correct NodeList::reset() from Application
2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510
Additional silencing of watchdog spam
2019-05-13 18:19:29 -07:00
Seth Alves
8b2d12e2f7
when an avatar entity is deleted, also delete its descendants
2019-05-13 17:33:10 -07:00
Zach Fox
89006cd9c5
Hide controls in top left; don't remove certain menus; fixup slider UIT
2019-05-13 17:26:19 -07:00
Roxanne Skelly
aa16430cf4
add a comment and kick build servers
2019-05-13 17:25:06 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246
...
Case 22246: Picks, PickType, RayPick JSDoc update
2019-05-13 16:16:17 -07:00
Roxanne Skelly
0319e8cc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-13 16:01:39 -07:00
Zach Fox
7bb2d6871b
Simlpified Slider (not totally working; position is off)
2019-05-13 15:58:04 -07:00
Roxanne Skelly
72fe3a66f5
Debugging code to monitor the queue depth for a few critical threads
2019-05-13 15:56:55 -07:00
Simon Walton
305a215d21
Pass a QObject context for the functor
2019-05-13 15:50:04 -07:00
amerhifi
9652d412ac
Merge branch 'master' into feature/platform
2019-05-13 15:39:55 -07:00
David Rowe
70ec84177a
Doc review
2019-05-14 10:32:28 +12:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407
...
Case 22407: Quat JSDoc update
2019-05-13 15:17:58 -07:00
Simon Walton
ede8859cc7
Call correct NodeList::reset() from Application
2019-05-13 14:38:34 -07:00
Andrew Meadows
2d21b5c269
use qt.conf file to find Qt resources
2019-05-13 14:26:16 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state
...
(BUGZ-40) Check for possible avatar fade race condition
2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
...
case 22190: Disable triggering away state when interface focus lost
2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash
...
BUGZ-125: Error message instead of crash if the GL version is too low
2019-05-13 13:12:30 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
...
Clear any reliable connection state upon Node ID change
2019-05-13 13:11:05 -07:00
Zach Fox
f799f96fba
simplifiedUI UIT switch
2019-05-13 13:04:12 -07:00
amerhifi
270d7feb7f
removed the duplicate function declaration
2019-05-13 12:20:22 -07:00
amerhifi
8623c3d74f
removing testing function declared in app.h
2019-05-13 12:14:48 -07:00
amerhifi
71d534c97d
merged master and resolved application conflict
2019-05-13 12:09:50 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch
...
Case 22379: Run-time switch for deferred/forward rendering
2019-05-13 11:14:26 -07:00
Zach Fox
feb5021372
UIT RadioButton
2019-05-13 11:07:39 -07:00
SamGondelman
eb8c722080
fix runtime switch
2019-05-13 09:58:55 -07:00
amerhifi
9899b8c858
Merge branch 'master' into feature/platform
2019-05-13 06:52:13 -07:00
amerhifi
13c9bb078c
cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues.
2019-05-13 06:50:08 -07:00
sabrina-shanman
736c7a9736
Change logging from 'fade-out animation' to 'fade-out transition'
2019-05-10 15:18:52 -07:00
sabrina-shanman
6f5bf01f2b
Add sanity check and logging for possible avatar fade lambda race condition
2019-05-10 14:33:25 -07:00
Shannon Romano
5c9570cffb
Merge pull request #15539 from jherico/fix/watchdog_spam
...
BUGZ-131: Reduce spam from watchdog thread
2019-05-10 14:24:15 -07:00
Simon Walton
4b51d81b42
Clear any reliable connection state upon Node ID change
2019-05-10 12:06:38 -07:00
Zach Fox
112e13383b
Dock it!
2019-05-10 12:03:29 -07:00
Brad Davis
0f8ddae9df
Reduce spam from watchdog thread
2019-05-10 12:01:07 -07:00
Shannon Romano
0d28932181
Merge pull request #15529 from Atlante45/feat/more-ice-logging
...
Add instrumentation to help track down connection issues
2019-05-10 11:57:24 -07:00
Brad Davis
db88f14e13
Error message instead of crash if the GL version is too low
2019-05-10 11:51:50 -07:00
Zach Fox
314c04ab96
Simplified UI v1
2019-05-10 10:49:25 -07:00
amerhifi
edb3206a24
adding macos platform. Misisng display and cpu info
2019-05-10 09:55:26 -07:00
Clement
0a7352074c
Fix android build
2019-05-09 17:17:43 -07:00
Shannon Romano
930032bcc6
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop
...
case 22166: Build complex shapes in ThreadPool instead of MainLoop
2019-05-09 17:14:50 -07:00
Shannon Romano
6aa8dc7c42
Merge pull request #15534 from kencooke/audio-PTT-output-ducking
...
Reduce echo when push-to-talk is used
2019-05-09 15:54:15 -07:00
Andrew Meadows
a0b34e4f15
more correct clearing of dirty flags for AvatarMotionState
2019-05-09 14:45:36 -07:00
Andrew Meadows
c7432ffe5f
also update easy flags when rebuilding avatar shape
2019-05-09 13:48:07 -07:00
Ken Cooke
1b733d3fb3
While PTT is active, duck the audio output by 20dB to reduce echo
2019-05-09 12:56:07 -07:00
amerhifi
0d97543ece
code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform
2019-05-09 12:04:41 -07:00
SamGondelman
59e7db2d6b
Merge remote-tracking branch 'upstream/master' into switch
2019-05-09 11:42:05 -07:00
danteruiz
0fae615cb4
fix dock widget context
2019-05-09 09:20:50 -07:00
Clement
b3d0705e39
Extend ICE logging + make it more searchable
2019-05-08 18:38:00 -07:00
Anthony Thibault
4ee39355f1
Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident
...
Add gpu_name, gpu_driver & gpu_memory to crash annotations
2019-05-08 16:09:13 -07:00
David Rowe
302e876857
Update InteractiveWindow JSDoc per changes in master
2019-05-09 10:26:16 +12:00
David Rowe
414f27208d
Merge branch 'master' into M22147
...
# Conflicts:
# interface/src/scripting/DesktopScriptingInterface.h
# interface/src/ui/InteractiveWindow.h
2019-05-09 08:43:05 +12:00
Anthony Thibault
78403e4436
Add gpu_name, gpu_driver & gpu_memory to crash annotations
...
This may help us identify the hardware causing early gl initialization errors.
2019-05-08 13:33:45 -07:00
David Rowe
c3730e41f7
Typos
2019-05-09 08:33:37 +12:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows
...
case LILY-30: Dockable Interactive Windows
2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1
dockable window
2019-05-08 10:04:31 -07:00
amerhifi
58cff374d7
merged master
2019-05-08 08:53:19 -07:00
Shannon Romano
e90f91f109
Merge pull request #15488 from sethalves/fix-indep-camera
...
case 22412: allow independent camera to be set by scripts
👍 by QL for pre-merge testing in the manu ticket
2019-05-07 09:38:54 -07:00
Andrew Meadows
f6916edac4
cleanup and removing some accidental C++-20-isms
2019-05-06 17:37:35 -07:00
Andrew Meadows
e770bd6142
build CollisionShapes and load RigidBodies even when not yet stepping
2019-05-06 17:37:35 -07:00
Andrew Meadows
af1f4364ef
don't forget to add detailedMotionStates to simulation
2019-05-06 17:37:35 -07:00
Andrew Meadows
a0841c937c
fix logic around updating off-thread shapes
2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df
split work out of EntityTree::update(), call it preUpdate()
2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca
overhaul of MotionState and shape creations
2019-05-06 17:37:35 -07:00
Shannon Romano
86f562de1b
Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock
...
Case 20521: Unplugging headphones with hifi open causes freeze
2019-05-06 15:03:56 -07:00
Wayne Chen
845ad38106
Merge pull request #15503 from wayne-chen/useThresholdMutedWarning
...
Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers
2019-05-06 13:55:59 -07:00
amer cerkic
26b38f5950
ifndef protection for headers
2019-05-06 13:51:52 -07:00
Shannon Romano
1636256068
Merge pull request #15496 from davidkelly/dk/bugz-6
...
Increase max heartbeat time to 10 sec on mac
2019-05-06 13:03:25 -07:00
amer cerkic
8273e5b666
fixing stuff based on comments and feedback from Sam. willc reate template for some of the getters since its the same old
2019-05-06 12:27:46 -07:00
Ken Cooke
ea9690d72b
Disable MIDI rescan after devicechange, to avoid deadlock
2019-05-06 10:46:54 -07:00
amer cerkic
cadcb8b7c3
Merge branch 'master' into feature/platform
2019-05-06 10:37:14 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
...
Avatar verification
2019-05-06 08:04:06 -07:00
David Rowe
9c12a39368
Merge branch 'master' into M22147
2019-05-06 11:28:22 +12:00
David Rowe
7183d10879
Desktop JSDoc
2019-05-06 10:26:16 +12:00
amerhifi
527cf8b3d3
adding cpu and memory as well as json serialization with the 3rd party library
2019-05-03 15:57:45 -07:00
amerhifi
2762597e6a
merged master
2019-05-03 09:12:21 -07:00
John Conklin II
16ece6c2fc
Merge pull request #15493 from amantley/bugPushToTalk
...
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
2019-05-03 09:03:36 -07:00
Angus Antley
1f004f34c4
added check for valid dynamic casts
2019-05-02 21:59:11 -07:00
Angus Antley
f019fa3a7c
Merge remote-tracking branch 'upstream/master' into bugPushToTalk
2019-05-02 18:28:34 -07:00
Sam Gateau
46f4b13f2f
Merge pull request #15499 from samcake/coco
...
BUGZ-92: Refresh rate Throttling refinements
2019-05-02 17:24:34 -07:00
Shannon Romano
5d3c88b964
Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory
...
(case 22368) Fix snapshots freezing Interface when no snap directory defined
2019-05-02 15:59:25 -07:00
amer cerkic
f09f6ebd08
initial interface setup for platform
2019-05-02 15:50:35 -07:00
Sam Gateau
02530bdd02
Refining the test to resetInactiveTimer
2019-05-02 14:51:45 -07:00
Saracen
43ddf7ca23
Unify cube and sphere edit menu entries into one.
2019-05-02 22:40:11 +01:00
David Kelly
0b2d11aeef
Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6
2019-05-02 12:37:16 -07:00
Wayne Chen
d31ed9ac22
adding timer for muted warning
2019-05-02 12:23:58 -07:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075
...
Case 22075: Controller JSDoc update
2019-05-02 11:34:58 -07:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068
...
Case 22068: Clipboard JSDoc
2019-05-02 11:15:25 -07:00
Sam Gateau
7f22ac1be4
FIxing a warning on unix
2019-05-02 08:57:19 -07:00
Sam Gateau
c7702048ad
Merge branch 'master' of github.com:highfidelity/hifi into coco
2019-05-02 08:50:30 -07:00
David Rowe
e217909f17
Merge branch 'master' into M22075
2019-05-02 20:19:17 +12:00
Sam Gateau
531ec14253
Applying my own comments, and refining the profile values
2019-05-02 00:54:00 -07:00
amantley
a8b54cbe10
changed reinterpret to dynamic cast
2019-05-01 17:32:39 -07:00
Sam Gateau
7f71ec8d3d
Apply my own comments
2019-05-01 16:57:03 -07:00
danteruiz
f65f28c52a
refresh rate controller
2019-05-01 16:04:33 -07:00
David Kelly
02b960db33
Increase max heartbeat time to 10 sec on mac (for now - not long-term solution)
2019-05-01 15:06:02 -07:00
amerhifi
a878232c6d
setting default cursor after display initialization for systems that do not call checkcursor on startup
2019-05-01 14:31:40 -07:00
amantley
4b7b416abf
corrected the behaviour for ctrl-m so that when you unmute during push to talk you will see it reflected in the audio icon color
2019-05-01 14:00:56 -07:00
Seth Alves
9321cf89d3
allow independent camera to be set by scripts
2019-05-01 07:20:52 -07:00
Sam Gateau
c1ee4deb12
Merge pull request #15478 from amerhifi/feature/systemMouse
...
Case 22378: System cursor in desktop mode instead of rendering texture from Displayplugin
2019-04-30 20:17:18 -07:00
sabrina-shanman
ef1ff2183b
Fix snapshots freezing Interface when no snap directory defined
2019-04-30 17:45:17 -07:00
David Rowe
e3ff0bbcdf
PlatformInfo JSDoc
2019-05-01 08:18:00 +12:00
David Rowe
7359d42b5c
Window JSDoc update
2019-05-01 08:17:27 +12:00
amer cerkic
df3049cb44
simplified way to switch to system cursor if non hmd mode
2019-04-30 11:49:33 -07:00
amer cerkic
978108b3ba
found a more simplified way to stop rendering the mouse unless its the Reticle cursor
2019-04-30 11:34:11 -07:00
David Rowe
7db1e33720
Note camera axes in Camera JSDoc
2019-04-30 12:13:43 +12:00
amer cerkic
7d2b75673c
fixed syntax for cursor
2019-04-29 16:42:49 -07:00
David Rowe
3032b58abc
Revise formatting of Facilities and Entity Methods sections
2019-04-30 10:10:46 +12:00
Shannon Romano
9261df5c24
Merge pull request #15383 from ctrlaltdavid/M22196
...
Case 22196: HMD JSDoc update
2019-04-29 13:05:32 -07:00
SamGondelman
8c032ea83f
Merge remote-tracking branch 'upstream/master' into switch
2019-04-29 11:08:01 -07:00
Shannon Romano
e6c7bb56f3
Merge pull request #15392 from ctrlaltdavid/M22215
...
Case 22215: Menu JSDoc update
2019-04-29 08:37:37 -07:00
Shannon Romano
5bf872b1b8
Merge pull request #15470 from parkerchard/master
...
- updated desktop icons and installer graphics
2019-04-26 21:16:04 -07:00
Simon Walton
a100345416
Ensure banner entity is local entity
2019-04-26 19:21:40 -07:00
Simon Walton
60389017a4
Merge from master, including avatar protocol change
...
Tony had added HandController version-type.
2019-04-26 18:51:41 -07:00
Simon Walton
1fe8f4332f
Fixes to banner; swap out avatar on client; reviewer comments; other WIP
2019-04-26 18:45:48 -07:00
David Rowe
407ce745d5
Merge branch 'master' into M22075
...
# Conflicts:
# libraries/controllers/src/controllers/Actions.cpp
2019-04-27 10:51:13 +12:00
David Rowe
eff97d48d3
Doc review
2019-04-27 10:34:06 +12:00
David Rowe
72ef36db02
Merge branch 'master' into M22196
2019-04-27 10:26:10 +12:00
David Rowe
fbe49bbfd4
Doc review
2019-04-27 10:20:35 +12:00
David Rowe
311826c04d
Merge branch 'master' into M22215
2019-04-27 10:03:24 +12:00
Parker Richard
4df3a29b00
- updated console+server icons, installer+uninstaller graphics, and console notification icon
2019-04-26 14:50:18 -07:00
SamGondelman
ca5c7e3904
runtime switch for deferred/forward rendering
2019-04-26 14:37:27 -07:00
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
