Commit graph

78089 commits

Author SHA1 Message Date
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
Sam Gateau
06dc9fc39f
Merge pull request #15494 from amerhifi/amdCursorbug
case 22438: setting default cursor after display initialization for systems that …
2019-05-02 08:50:19 -07:00
Sam Gateau
531ec14253 Applying my own comments, and refining the profile values 2019-05-02 00:54:00 -07:00
Sam Gateau
d031e8806a Merge branch 'master' of https://github.com/highfidelity/hifi into coco 2019-05-01 21:48:34 -07:00
Sam Gateau
7f71ec8d3d Apply my own comments 2019-05-01 16:57:03 -07:00
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
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
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
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
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
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
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
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
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
d08e2e5ca1 Fixing th emerge conflict 2019-04-26 13:44:49 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing
Case 22255: Add size checks for trait packets parsing
2019-04-26 13:29:50 -07:00
Shannon Romano
19bc46bb9d
Merge pull request #15461 from davidkelly/dk/22047
There is no anon restriction - only open, hifi, acl
2019-04-26 12:25:06 -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
Shannon Romano
4947f14eb7
Merge pull request #15394 from ctrlaltdavid/M22223
Case 22223: Messages JSDoc update
2019-04-26 10:40:10 -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