samcake
7655f906f1
Starting adding a timer for the frame
2016-11-03 19:26:30 -07:00
howard-stearns
c5ee1941d1
raise desktop when showing it
2016-11-03 17:02:47 -07:00
Brad Hefta-Gaub
7cca8f0a66
Merge pull request #8993 from samcake/blue
...
Prevent sparse texture on AMD gpus for now
2016-11-03 16:48:52 -07:00
samcake
1086585559
fixing the test to actually capture ati correctly and add the report to the ui
2016-11-03 15:15:05 -07:00
Clément Brisset
00a94bdd6d
Merge pull request #8974 from huffman/feat/help-select-xbox-tab
...
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-03 14:42:23 -07:00
Brad Hefta-Gaub
206f1ead1a
Merge pull request #8990 from howard-stearns/centered-toolbar
...
centered toolbar
2016-11-03 14:18:32 -07:00
howard-stearns
b6e440f891
delete this and formatting
2016-11-03 13:26:50 -07:00
howard-stearns
7c45a78cb0
Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file
2016-11-03 13:17:47 -07:00
howard-stearns
3a072b5bf9
tell desktop about preference changes
2016-11-03 12:17:28 -07:00
howard-stearns
6aad78c8e8
Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar
2016-11-03 11:23:47 -07:00
Zach Fox
9a22c29788
Get ready for merge
2016-11-03 11:20:08 -07:00
Zach Fox
e9e1d0cb2f
Remove erroneous exclamation mark
2016-11-03 11:10:32 -07:00
Zach Fox
b74c1d3476
tabs to spaces
2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf
Making progress...
2016-11-03 10:39:55 -07:00
howard-stearns
f3d4821579
constrain toolbar based on setting. (ui for settings to come.)
2016-11-03 10:39:53 -07:00
howard-stearns
10309cc699
Merge branch 'master' of https://github.com/highfidelity/hifi into centered-toolbar
2016-11-02 15:38:24 -07:00
howard-stearns
90ebbb79c1
centered toolbar
2016-11-02 15:37:53 -07:00
Ryan Huffman
3d160cca75
Merge pull request #8969 from huffman/feat/task-manager-app-name
...
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
2016-11-02 14:21:19 -07:00
Dante Ruiz
a948e03ed8
changed old icon to new icon
2016-11-02 08:23:10 -07:00
Ryan Huffman
26e0d02d60
Remove unused 'first' variable
2016-11-01 16:40:41 -07:00
Ryan Huffman
bbef071723
Update interface to default to HMD display plugin
2016-11-01 16:23:53 -07:00
Zach Fox
b98c6cb50f
Change 'Snapshot' to 'snapshot' and use smaller font
2016-11-01 14:49:18 -07:00
howard-stearns
52cc03c5a2
Get snapshot location data from file, which now uses shareable place info.
2016-11-01 14:44:39 -07:00
Zach Fox
c4b59eafbb
Add 'Snapshot' text. My very first commit!
2016-11-01 14:09:25 -07:00
Ryan Huffman
3147ea9e33
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-01 13:43:55 -07:00
Ryan Huffman
5f8cee787f
Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename
2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501
Add VersionInfo.rc to interface
2016-11-01 09:00:08 -07:00
Chris Collins
6698b1617b
Merge pull request #8945 from thoys/patch-8
...
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
Chris Collins
3b6faefe05
Merge pull request #8931 from sethalves/possible-fix-for-2068
...
Possible fix for 2069
2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
8fbac58091
remove mute icons
2016-10-30 09:33:02 -07:00
Seth Alves
3ad748cfe2
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 16:41:39 -07:00
Stephen Birarda
207d26091c
Merge pull request #8953 from Atlante45/being-of-light
...
Update being of light model
2016-10-28 15:36:19 -07:00
Chris Collins
d9d9119dcb
Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi
...
fix crash on shutdown from web audio captures
2016-10-28 15:23:39 -07:00
Atlante45
8ebe92487a
Update being of light model
2016-10-28 14:56:36 -07:00
Brad Hefta-Gaub
cec982b004
Merge pull request #8952 from jherico/openvr_min_spec
...
Updating min spec overlay image
2016-10-28 14:47:21 -07:00
Brad Davis
93be00fe79
Updating min spec overlay
2016-10-28 14:45:24 -07:00
Zach Pomerantz
be23668ca8
delete websurfaces on shutdown
2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 11:36:09 -07:00
Andrew Meadows
fe716b3641
Merge pull request #8941 from thoys/patch-7
...
QuickFix for weird avatar when switch Vive -> Desktop mode
2016-10-28 11:14:40 -07:00
Thijs Wenker
597e52636a
Fix Oculus hand controllers to only work in HMD
2016-10-28 19:22:44 +02:00
Brad Hefta-Gaub
4f6cbf762d
Merge pull request #8942 from jherico/openvr_min_spec
...
Updates for min spec check for Steam
2016-10-27 20:08:35 -07:00
Brad Hefta-Gaub
97f622f003
Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains
...
Fix for crash in QtWebEngineCore when rapidly switching domains
2016-10-27 20:01:31 -07:00
Brad Davis
23fc865d40
Updates for min spec check
2016-10-27 19:28:46 -07:00
Thijs Wenker
2dcbe18e5b
Fix for weird avatar Switch Vive -> Desktop mode
2016-10-28 04:07:20 +02:00
Anthony J. Thibault
1fc310434e
Fix for crash in QtWebEngineCore when rapidly switching domains
...
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Brad Davis
e9db8be435
Fix linux build
2016-10-27 16:51:52 -07:00
Brad Davis
018d945b85
Display warning overlay instead of scene when below min spec
2016-10-27 15:51:26 -07:00
Brad Davis
012e215f62
Merge pull request #8922 from ZappoMan/report45hzTarget
...
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
2016-10-27 14:03:07 -07:00
Clément Brisset
745f6546dd
Merge pull request #8932 from huffman/fix/gamepad-help-image
...
Update help image for gamepad to include grab and click lasers
2016-10-27 13:31:15 -07:00
Brad Hefta-Gaub
bfe6ebb44f
some tweaks
2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f
Merge pull request #8923 from Atlante45/steamvr
...
Add getter for SteamVR's buildID to SteamClient
2016-10-27 11:38:35 -07:00
Ryan Huffman
5326202313
Update help image for gamepad to include Note
2016-10-27 10:54:49 -07:00
Chris Collins
ab8e5759b0
Merge pull request #8929 from ZappoMan/addAudioStatsToMenu
...
add a menu item to run audio stats script
2016-10-27 10:43:20 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Brad Hefta-Gaub
c6d89f181a
CR feedback
2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub
d778b3b4ce
fix the timing of the launchedFromSteam property
2016-10-27 10:00:48 -07:00
Brad Hefta-Gaub
76344f3253
add a menu item to run audio stats script
2016-10-26 22:41:56 -07:00
Brad Davis
1c89fa2291
Make threaded submit in OpenVR controllable from menu
2016-10-26 15:28:42 -07:00
Atlante45
f26ddc6f8b
Add getter for SteamVR's buildID to SteamClient
2016-10-26 14:51:48 -07:00
Brad Hefta-Gaub
e464858c4c
use SteamClient::isRunning() instead of command line param
2016-10-26 14:08:18 -07:00
Brad Hefta-Gaub
5f2b4c2a7f
CR feedback
2016-10-26 13:27:11 -07:00
Brad Hefta-Gaub
f95a731249
add app property when the app was launched from steam
2016-10-26 13:22:03 -07:00
Chris Collins
d25a4fb1cb
Merge pull request #8910 from zzmp/fix/qml-audio-shutdown-order
...
fix shutdown order of qml/audio
2016-10-26 11:37:54 -07:00
Brad Hefta-Gaub
863bf067b7
Merge pull request #8893 from jherico/texture_force_sparse
...
Changes to texture loading rules
2016-10-25 18:22:42 -07:00
Brad Hefta-Gaub
b0b950e132
Merge pull request #8898 from ctrlaltdavid/fix-overlaywebwindow-keyboard
...
Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes
2016-10-25 17:59:46 -07:00
Brad Davis
ce627eeea1
Updated metrics
2016-10-25 17:49:51 -07:00
Zach Pomerantz
4913654f44
Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order
2016-10-25 17:49:30 -07:00
Brad Hefta-Gaub
56b0995047
Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix
...
Crash on exit fix for render items
2016-10-25 17:34:46 -07:00
Chris Collins
3b31b28622
Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits
...
fix a couple of crash-on-exits
2016-10-25 17:03:21 -07:00
Zach Pomerantz
78a04255ab
amend qml/audio ordering comment
2016-10-25 16:35:56 -07:00
Brad Hefta-Gaub
001cfc7e15
Merge pull request #8901 from samcake/blue
...
Adding more detailed counters for texture memory consumption
2016-10-25 16:19:56 -07:00
Zach Pomerantz
5413d97089
cleanup qml before audio
2016-10-25 15:54:08 -07:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240
tweak format of gl_info
2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub
e22a2e9e2f
add gl info and gpu free memory to user stats
2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee
add location and build info to user activity stats
2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062
fix a couple of crash-on-exits
2016-10-25 13:58:48 -07:00
samcake
507d3e5a39
IMprove the counting and namoing of the new couters the gl swapchain
2016-10-25 12:28:07 -07:00
Brad Hefta-Gaub
1bbf0179dd
Merge pull request #8894 from ZappoMan/xboxLasers
...
Adds support for "lasers" to the Oculus+xbox controller
2016-10-25 09:18:00 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
sam
6b2b68e691
trying to add counters for the default FBO
2016-10-25 03:36:23 -07:00
David Rowe
34b9d3eecc
Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes
2016-10-25 20:25:34 +13:00
Brad Hefta-Gaub
62f63f32a7
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 20:24:29 -07:00
samcake
58b81e3b0c
Adding counter for the amount of memory used in texture for Framebuffers
2016-10-24 18:34:16 -07:00
Clément Brisset
dd45500313
Merge pull request #8891 from huffman/fix/disconnected-dialog-updates
...
Fix several aspects of the "disconnected" dialog
2016-10-24 15:39:16 -07:00
Brad Hefta-Gaub
a25d50387e
gak
2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca
Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired
2016-10-24 14:45:41 -07:00
Ryan Huffman
bbf5afeb8d
Remove use of start() w/o param in ConnectionMonitor
2016-10-24 14:35:38 -07:00
Ryan Huffman
5077ec2044
Remove unused indicateDomainConnectionFailure
2016-10-24 14:35:09 -07:00
Ryan Huffman
f3ef0cebed
Update ConnectionMonitor to not show poopup on domain connection refusal
2016-10-24 14:27:28 -07:00
Brad Davis
da9eb0433c
Remove workaround for QML HDPI offscreen rendering bug
2016-10-24 11:51:40 -07:00
Ryan Huffman
e7023b3d99
Add ConnectionFaiureDialog qml
2016-10-24 10:52:46 -07:00
Ryan Huffman
5b58e8ae97
Fix ConnectionHandler not handling connected-but-need-auth condition
2016-10-24 10:44:33 -07:00
Ryan Huffman
84bcefc147
Update ConnectionMonitor to increase timeout on startup
2016-10-24 10:28:13 -07:00
Ryan Huffman
32b5c84bec
Update ConnectionMonitor to init at end of startup
2016-10-24 10:27:27 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Brad Davis
861b69aa94
Add free GPU memory to the displayed stats
2016-10-23 13:07:38 -07:00
Brad Davis
62de2af944
Add more GPU stats, make stats easier to read
2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub
ee1f3ac38c
Merge pull request #8881 from jherico/offscreen_texture_memory_stats
...
Report offscreen texture memory usage in stats
2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92
Merge pull request #8880 from hyperlogic/feature/controller-display
...
Show hand controllers in away.js
2016-10-21 17:43:52 -07:00
David Kelly
aa31d3d8cc
Heartbeats need to happen while waiting for sandbox
...
We can only know if sandbox is up by waiting for the http request to
succeed or fail. In the common case (fail since it isn't up yet), we
have to wait until a connect timeout in http. Seems that is a couple
seconds, and in that time we really upset the deadlock watchdog thread
since it keeps a moving average of heartbeat times.
Simple solution, updateHeartbeat while waiting, and right before we
start.
2016-10-21 14:43:39 -07:00
Brad Hefta-Gaub
ba9d9f6ab7
Merge pull request #8860 from davidkelly/dk/2004
...
Fix for sandbox startup issue
2016-10-21 14:24:08 -07:00
Anthony J. Thibault
c431c69d60
Merge branch 'master' into feature/controller-display
2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a
add Bullet profile info to PerformanceTimer stats
2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e
Report offscreen texture memory usage in stats
2016-10-21 11:31:37 -07:00
Anthony J. Thibault
60f728585a
away.js now shows hand controllers in away mode.
...
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc
Merge pull request #8867 from jherico/offscreen_textures
...
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 17:07:29 -07:00
David Kelly
20b140317c
PR feedback
...
bool to indicate sandbox is actually running.
2016-10-20 17:01:09 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Howard Stearns
0eee6f8abd
Merge pull request #8844 from huffman/fix/hud-position
...
Update default system toolbar position
2016-10-20 16:07:20 -07:00
Brad Davis
9523660027
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub
8a071f18b3
more work
2016-10-20 11:18:20 -07:00
David Kelly
ab02fd79a0
since we know the state, use that boolean
2016-10-20 10:12:26 -07:00
howard-stearns
6f283a4893
fix resize on plugin switch
2016-10-20 09:39:02 -07:00
Brad Hefta-Gaub
1a28732b64
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
...
Conflicts:
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
bf732127ca
Merge pull request #8856 from jherico/geometry_ids
...
Remove the use of implicit ids in geometry cache
2016-10-20 08:14:49 -07:00
Ryan Huffman
9dee1b85fe
Merge pull request #8855 from birarda/blank-asset-delete
...
force valid file path for asset file mapping operations
2016-10-19 14:22:26 -07:00
David Kelly
5b7f0cb358
Fix for sandbox startup issue
...
Move determinedSandboxState=true until after we spawn it.
2016-10-19 13:51:20 -07:00
Stephen Birarda
e3f194b4dd
use the err directly on upload error
2016-10-19 12:41:01 -07:00
Howard Stearns
3f4ca27e76
Merge pull request #8839 from howard-stearns/unit-scaled-address-bar
...
Unit scaled address bar
2016-10-19 12:31:00 -07:00
Brad Hefta-Gaub
aa50f460c3
Merge pull request #8851 from jherico/qml_limit
...
Rate limit QML web surfaces
2016-10-19 12:04:47 -07:00
Stephen Birarda
179cb67cdb
change order of asset upload failure changes
2016-10-19 11:55:54 -07:00
Stephen Birarda
b80f3fbd7b
fix error handling for failed asset upload
2016-10-19 11:37:35 -07:00
howard-stearns
36951c3c95
colors
2016-10-19 11:24:21 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
howard-stearns
a5fc0d92a2
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-19 11:11:05 -07:00
Seth Alves
e247f0aa34
Merge pull request #8850 from zzmp/fix/model-attachment-lifetime
...
ensure model attachment lifetimes
2016-10-19 09:56:02 -07:00
Brad Hefta-Gaub
6bd193cdd8
hacking
2016-10-18 21:33:37 -07:00
Stephen Birarda
18523558f7
move HFWebEngineProfile back to interface/networking
2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e
Rate limit QML web surfaces
2016-10-18 19:29:11 -07:00
Zach Pomerantz
a9bad592f9
ensure model attachment lifetimes
2016-10-18 18:01:18 -07:00
Howard Stearns
20ed77d425
Merge pull request #8840 from Atlante45/keyboard
...
Add virtual keyboard for steam username collision
2016-10-18 17:34:55 -07:00
Stephen Birarda
9f2627d31d
Merge pull request #8828 from birarda/web-engine-interceptor
...
move HF access token to authorization header
2016-10-18 17:24:58 -07:00
David Rowe
c8e9e4ecd0
Fix suggestion card appearing behind keyboard
2016-10-19 10:13:07 +13:00
Ryan Huffman
3ad039cadc
Update default system toolbar position
2016-10-18 13:57:03 -07:00
Stephen Birarda
f8e0d7ad88
move QWebEngine classes to ui library
2016-10-18 12:53:32 -07:00
Atlante45
0858b3fc8d
Inform user their Steam informations will not be shared
2016-10-18 12:07:18 -07:00
Stephen Birarda
5682d51667
use the HFWebEngineProfile in Desktop.qml
2016-10-18 11:42:55 -07:00
Atlante45
c40a027108
Add virtual keyboard for steam username collision
2016-10-18 11:16:14 -07:00
Stephen Birarda
c4cec8eb1e
use desktop profile again, move classes to networking subdir
2016-10-18 10:22:31 -07:00
howard-stearns
ecd84bf23d
desktop vertical
2016-10-18 10:05:39 -07:00
Stephen Birarda
a45677c2a2
mark intercept override, only add header for HTTPS
2016-10-18 10:03:46 -07:00
Brad Hefta-Gaub
834a15a03b
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-18 10:01:57 -07:00
Brad Hefta-Gaub
c50cd865e5
add RTClick and LTClick support to gamepad
2016-10-18 09:50:35 -07:00
howard-stearns
0d2bd23874
cleanup
2016-10-18 09:38:55 -07:00
howard-stearns
0dd5c65036
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-18 09:36:43 -07:00
howard-stearns
3ce3e57c38
Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar
2016-10-18 09:36:09 -07:00
Brad Hefta-Gaub
0d48eb55b9
Merge pull request #8835 from zzmp/fix/entity-del-deadlock
...
fix deadlock when removing tablet
2016-10-18 01:21:55 -07:00
