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 |
|
Sam Gateau
|
02530bdd02
|
Refining the test to resetInactiveTimer
|
2019-05-02 14:51:45 -07: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 |
|
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 |
|