Commit graph

78174 commits

Author SHA1 Message Date
Sam Gondelman
222d36c7d0
Merge pull request #15480 from SamGondelman/tests
Case 22418: Fix model bounds on resize
2019-05-01 16:50:07 -07:00
Sam Gateau
ad60c51197 Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-01 16:04:58 -07:00
danteruiz
f65f28c52a refresh rate controller 2019-05-01 16:04:33 -07:00
Anthony Thibault
b0af8b1bdc
Merge pull request #15489 from luiscuenca/jointIndicesCrashFix
Fix memory corruption in _modelJointIndicesCache QHash
2019-05-01 15:17:08 -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
Clement
ecc38a8287 Push protocol version 2019-05-01 14:32:04 -07:00
Clement
281f92e3ea Query shape type outside lock 2019-05-01 14:31:53 -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
Anthony Thibault
4821e745cc
Merge pull request #15482 from amantley/bugAwayAudioToggle
Fixed: turning on your microphone will now take you out of Away mode
2019-05-01 12:44:13 -07:00
luiscuenca
6e2ac14c23
Change while loops 2019-05-01 12:42:41 -07:00
NissimHadar
bf24a083fc
Merge pull request #15479 from NissimHadar/22415-fixBackTraceUploadFailures
Case 22145: Fix BackTrace upload failures
2019-05-01 11:47:05 -07:00
NissimHadar
9dfcb675ca Moved script. 2019-05-01 10:47:40 -07:00
NissimHadar
b9e2174fe9 Use exit(1) on errors 2019-05-01 10:10:28 -07:00
luiscuenca
73454b06a2
Fix crash accessing _modelJointIndicesCache 2019-05-01 08:57:09 -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
Simon Walton
119b4fd826 Handle incoming clients to domain with existing verify-failed avatars 2019-04-30 17:39:39 -07:00
raveenajain
0a3a6c52f9 initial information needed for joint shape info 2019-04-30 17:12:35 -07:00
Simon Walton
a0fd828ef7 Set default av-mixer connection-rate to 1e7 2019-04-30 16:00:35 -07:00
NissimHadar
867f1f80df Improved messages. 2019-04-30 15:26:39 -07:00
Angus Antley
c0da46453b made correction 2019-04-30 14:34:10 -07:00
NissimHadar
125d182773 Added try/except blocks. 2019-04-30 14:09:16 -07:00
Angus Antley
5c6ea082db changed away script to make you active if you turn on your mic 2019-04-30 14:06:18 -07:00
SamGondelman
5a184bd584 fix model bounds 2019-04-30 13:38:11 -07:00
NissimHadar
dd1525c9b7 First version of BackTrace upload python script. 2019-04-30 12:27:08 -07:00
amer cerkic
49cecdee6e fixing spacing 2019-04-30 11:52:37 -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
Simon Walton
7c405b0714 Don't substitute own avatar; FST URL regex fixes; better error handling 2019-04-29 18:20:54 -07:00
amer cerkic
7d2b75673c fixed syntax for cursor 2019-04-29 16:42:49 -07:00
amer cerkic
00a153c730 moving work location 2019-04-29 16:39:34 -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
69b1b38807
Merge pull request #15471 from danteruiz/mac-window-size
Case 22363: Setting mac window size to 1/2 screen resolution on first Run
2019-04-29 08:38:41 -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
Simon Walton
ae68478aea Remove avatarTheftPrototype.js 2019-04-27 23:42:28 -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
Simon Walton
5ffce7f1a1
Merge pull request #15467 from samcake/sol
case 22353: Mac Game loop performances was borked
2019-04-26 17:19:16 -07:00
danteruiz
d73f685ef2 change mac default window size 2019-04-26 16:56:38 -07:00
Parker Richard
ae348babe4 - reverted to original installer + uninstaller graphics 2019-04-26 16:16:06 -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