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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|