Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
...
suppress 'No instance available' messages during shutdown. try a dif…
2018-11-30 10:10:43 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988
...
Fix memory accumulating while Interface is minimized
2018-11-30 09:39:14 -08:00
Seth Alves
fac27553d7
suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.
2018-11-27 17:02:48 -08:00
Seth Alves
8f21ade0c7
make cmake -DDISABLE_QML=1 work again
2018-11-27 12:41:40 -08:00
David Rowe
7ffa70d0ac
Fix memory accumulating while Interface is minimized
2018-11-20 09:36:58 +13:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
...
MS19550 - Don't show help for HMDs that aren't plugged in and active
2018-11-16 15:49:46 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
...
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
r3tk0n
60832b071c
Fix logic for cases with rift headset but no touch controllers.
2018-11-15 14:08:38 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash
...
Rework audio data memory ownership model to fix injector crashes
2018-11-15 13:25:42 -08:00
Dante Ruiz
20ad05726e
entity server timout
2018-11-15 10:52:40 -08:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
...
FB17479 - Fix scripted key release events for handshakes.
2018-11-15 09:21:32 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
Thijs Wenker
cc207537a3
Fix for unintended snapshots while parenting/un-parenting
2018-11-14 01:05:38 +01:00
r3tk0n
dd8bbeb0e5
Clean up code and remove comments.
2018-11-13 15:36:25 -08:00
r3tk0n
ecee319602
Get logic working correctly.
2018-11-13 15:20:46 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820
...
Fix entities not loading when Interface doesn't have focus
2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
4cab805392
Merge pull request #12718 from gcalero/tester_flag
...
Detect if Interface is running on an android testing device
2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
...
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
...
Bug fix for head trackers in desktop mode
2018-11-13 11:49:24 -08:00
Dante Ruiz
10d045b11b
fix infinate loading if entity server is not running
2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus
...
Case 19475: Fix various Oculus Store test failures
2018-11-13 11:06:39 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577
...
Add option to start up at home location
2018-11-13 09:29:37 -08:00
David Rowe
e12833da23
Fix entities not loading when Interface doesn't have focus
...
Reverts https://github.com/highfidelity/hifi/pull/14286
2018-11-13 14:50:02 +13:00
r3tk0n
597f83e6d5
HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2
2018-11-12 13:58:37 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
...
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
2018-11-12 10:45:52 -08:00
David Rowe
c9b3fda724
Merge branch 'master' into M19768
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
r3tk0n
d2a1b35f96
Fix desktop case showing Vive controls.
2018-11-08 16:50:11 -08:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
...
3D Keyboard.
2018-11-08 13:35:13 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin
...
case 18450: Do not show login dialog if requested not to on the command line.
2018-11-08 10:43:21 -08:00
Dante Ruiz
358aa547b1
feedback changes
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
David Rowe
28097933ed
Add setting to enable/disable the mini tablet
2018-11-07 14:39:06 +13:00
Howard Stearns
05becb870f
remove urls from logs in Interface
2018-11-06 13:47:07 -08:00
Zach Fox
c33f9b6ea3
Fix build error
2018-11-06 11:26:09 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Anthony Thibault
ac8281075b
Code review feedback
...
Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()
2018-11-05 17:25:00 -08:00
Anthony Thibault
ac8869eb61
Bug fix for head trackers in desktop mode
...
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
Gabriel Calero
344774dcec
Merge remote-tracking branch 'upstream/master' into tester_flag
2018-11-05 19:13:04 -03:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Sam Gateau
fa0c58fa0e
Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend
2018-11-02 00:08:47 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
David Rowe
ae2715af31
Add option to start up at home location
2018-11-01 08:57:12 +13:00
