Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 07:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49340 commits 25 branches 0 tags 1.1 GiB
Commit graph

18535 commits

Author SHA1 Message Date
Ryan Huffman
3fcc2d3fa5 Add jsdoc to Clipboard 2016-11-14 13:52:16 -08:00
Ryan Huffman
7e2bb0e5ed Cleanup camera docs 2016-11-14 13:51:51 -08:00
howard-stearns
6078b833a1 Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome 2016-11-14 13:47:32 -08:00
howard-stearns
4cdda7c20f Merge remote-tracking branch 'origin/quasi-tabbed-goto' into no-snapshots-welcome 2016-11-14 13:13:58 -08:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
Ryan Huffman
ec86b82079 Add jsdoc to Camera 2016-11-14 12:14:24 -08:00
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
Howard Stearns
fac5d1e12e group snapshots by place 2016-11-12 17:00:54 -08:00
Howard Stearns
17428d7ecb tab-like filtering of suggestions by type 2016-11-12 15:23:11 -08:00
Howard Stearns
fcbf4f421a no scroll margins 2016-11-12 10:04:15 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Brad Hefta-Gaub
0dc7f0bf17 Merge pull request #9055 from jherico/fix_stats 
Fix buffer count in stats display
 2016-11-11 13:31:55 -08:00
Brad Davis
0aec9400c7 Fix buffer count in stats display 2016-11-11 12:54:19 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter 
Add stutter tracking
 2016-11-11 11:39:00 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView 
Fixed menu out of view with HMD and Xbox controller
 2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub
6db3556dc5 Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd 
Disable viewpoint menus in hmd
 2016-11-10 17:52:50 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Brad Davis
16060d50af Merge pull request #9041 from jherico/disable_incremental 
Remove incremental texture transfers
 2016-11-10 15:43:20 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -08:00
David Rowe
975eea8702 Automatically continue once Zip file is ready 2016-11-11 12:04:05 +13:00
Stephen Birarda
d5722c1654 fix clamping of scale and DRY it up 2016-11-10 15:03:13 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub
ff559aa4a1 Merge pull request #9042 from hyperlogic/feature/jsdoc 
Generate JS documentation from comments in C++ source
 2016-11-10 10:17:39 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
David Rowe
1fe5e451bf Customize Clara item menu 2016-11-10 20:28:41 +13:00
David Rowe
492e98c31e Fix up library link from Clara item page 2016-11-10 18:20:36 +13:00
David Rowe
5503adac3e Display "image" option for each Clara marketplace item 2016-11-10 17:55:12 +13:00
David Rowe
84795439ea Display Clara.io download information 2016-11-10 16:29:48 +13:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
samcake
f5fd4bf8d1 Merge pull request #9014 from jherico/texture_derez 
Re-enable downsampling for non-sparse textures
 2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub
770bf35d2b CR feedback 2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub
cf3d1011f4 remove scripts from avatar attached entities for other avatars 2016-11-09 12:26:57 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
Howard Stearns
666d2dd2fc Merge pull request #9031 from davidkelly/dk/2178 
Log snapshot upload and user story creation errors
 2016-11-08 12:11:16 -08:00
Howard Stearns
0a56f7c4fe Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt 
fix numeric keyboard for hmd Window.prompt
 2016-11-08 12:05:13 -08:00
David Kelly
1766ebab2c Added a bit more logging 2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
David Kelly
3105299670 Log snapshot upload and user story creation errors 
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
 2016-11-07 18:13:10 -08:00
David Rowe
76de7bf03c Fix typo 2016-11-08 13:53:37 +13:00
David Rowe
8cceda1cfe Tidy UI text 2016-11-08 13:23:44 +13:00
David Rowe
afd2a900a3 Improve error handling for case that don't have permissions 2016-11-08 13:22:50 +13:00
Chris Collins
eec8e2f19b Merge pull request #9000 from samcake/punk 
Add Frame Timing and GPU memory to the Stats and user activity log
 2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
David Rowe
090065ee34 Add user feedback on download process 2016-11-08 13:05:35 +13:00
Seth Alves
24556fc70d Merge pull request #8980 from huffman/feat/default-to-hmd 
Update interface to default to HMD display plugin
 2016-11-07 13:36:39 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
howard-stearns
84eb1721e7 fix numeric keyboard for hmd Window.prompt 2016-11-04 17:02:14 -07:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
samcake
449add6b34 Fix bad variable initialization 2016-11-04 13:29:27 -07:00
Ryan Huffman
0cec62b3a3 Revert "Update interface to default to HMD display plugin" 
This reverts commit bbef071723.
 2016-11-04 12:27:15 -07:00
Ryan Huffman
0dac2c999e Revert "Remove unused 'first' variable" 
This reverts commit 26e0d02d60.
 2016-11-04 12:27:04 -07:00
Ryan Huffman
3ad9c1a797 Add check to go into HMD on first run if available 2016-11-04 12:26:20 -07:00
samcake
76aa541d4a Adding the frame gpu and batch timer 2016-11-04 11:49:52 -07:00
Andrew Meadows
836aad7d0b Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it 
raise desktop when showing it
 2016-11-04 10:45:05 -07:00
samcake
3db1831841 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2016-11-04 09:59:28 -07:00
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
David Rowe
d1e54a9217 Fix Clara download failing if move mouse after initiating download 2016-11-04 10:49:16 +13: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
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
David Rowe
0c47960553 Don't raise keyboard for non-text HTML input fields 2016-11-03 09:01:28 +13:00
David Rowe
de5e02310b Provide keyboard in marketplaces window 2016-11-03 09:00:40 +13:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
David Rowe
c578cd4b6d Inject keyboard raising and lowering script into marketplaces window 2016-11-02 17:06:40 +13:00
David Rowe
41c7f714e2 Add keyboard control to marketplaces window 2016-11-02 16:49:45 +13: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
David Rowe
10490a9fad Default collision shap to hull per submesh instead of static 2016-11-02 10:45:00 +13: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
David Rowe
667a777695 Use Clara.io API for FBX downloads 2016-11-01 23:43:15 +13:00
David Rowe
93beaa81c0 Code tidying 2016-11-01 13:27:05 +13:00
David Rowe
cee8b66ce9 Handle duplicate Clara download asset names 2016-11-01 13:26:05 +13:00
David Rowe
3ca2c19075 Delete temporary directory after content has been used 2016-11-01 12:31:35 +13: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
David Rowe
8ab56fe871 Automatically download Clara model to ATP and add to world 2016-10-31 16:02:20 +13:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
David Rowe
098200a5dd Hide brief flash of browser window used for download 2016-10-30 15:50:41 +13:00
David Rowe
e0ef24a460 Set auto adding for Clara downloads 2016-10-30 15:35:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
David Rowe
97407e1cd5 Canonical default browser URL 2016-10-29 21:31:44 +13:00
David Rowe
5e82410371 Make Clara.io download more robust 2016-10-29 21:31:27 +13: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
Andrew Meadows
5e273664db improved ray tests for HMD driving 2016-10-26 17:28:35 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -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
Anthony J. Thibault
69bd4ccea2 Show hand controllers when out-of-body for more then 3/4 of a second 
Without the timer, the hands can flicker in and out of visibility when lightly brushing against collision.
 2016-10-24 18:16:05 -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
Andrew Meadows
42c6996aee fix warning about unused variable 2016-10-24 14:05: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
Andrew Meadows
8ecc23f62b HMD drive stops against simple walls 2016-10-24 08:26:44 -07:00
Andrew Meadows
06866957d0 first pass (theoretical) HMD ray-traced step logic 2016-10-24 08:26:44 -07:00
Andrew Meadows
66479808ba cleanup velocity calculation in HMD mode 2016-10-24 08:26:44 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -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
Andrew Meadows
f414ffaf98 fix crash in MyCharacterController on shutdown 2016-10-18 21:03:02 -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
Andrew Meadows
a4308f08a4 remove debug cruft 2016-10-18 16:50:19 -07:00
Andrew Meadows
6a445a0a98 more correct steepest walkable slope detection 2016-10-18 16:48:33 -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
Andrew Meadows
5a04c7ceee remove tabs in formatting 2016-10-18 13:09:42 -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
Andrew Meadows
ecc6cb49ae more correct hitFraction adjustments 2016-10-18 11:42:31 -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
Brad Hefta-Gaub
13e5c31d0d Merge pull request #8829 from jherico/gpu_leak 
Fix GPU buffer leak in geometry cache / overlays
 2016-10-18 01:12:44 -07:00
Chris Collins
a9dd31f59d Merge pull request #8833 from jherico/gpu_stats 
Add GPU buffer and texture current counts to the main stats display
 2016-10-17 21:03:23 -07:00
Andrew Meadows
6f5f6d2493 adding ray shotgun scan for avatar motion 
using the shotgun scan results to deterimine if slope is walkable
 2016-10-17 17:58:52 -07:00
Seth Alves
ff32ddae01 Merge pull request #8832 from howard-stearns/fix-directory-picker-when-choosing-default 
directory picker works when choosing the initial value
 2016-10-17 17:40:25 -07:00
Brad Davis
99ed7ac08c Fix shutdown crash (hopefully) 2016-10-17 17:38:10 -07:00
Stephen Birarda
3cbdf13931 add intercepted profile to uit WebView 2016-10-17 15:04:33 -07:00
howard-stearns
7a3c14683e switchable placeholder for domain-connection failure, currently a modal 2016-10-17 14:50:46 -07:00
Stephen Birarda
4ec703b7dc remove unused import from uit WebView 2016-10-17 14:29:12 -07:00
Stephen Birarda
3ce47631b7 move the intercepted web engine profile to BaseWebView 2016-10-17 14:25:59 -07:00
Zach Pomerantz
95eb52ad17 bail early when removing entity focus 2016-10-17 14:02:22 -07:00
Brad Davis
1e9c369660 Add GPU buffer and texture current counts to the main stats display 2016-10-17 14:02:14 -07:00
howard-stearns
e7392acb10 directory picker works when choosing the initial value 2016-10-17 13:50:23 -07:00
Brad Hefta-Gaub
bf4489f3cf Merge pull request #8830 from huffman/feat/update-gamepad-help 
Update gamepad help image
 2016-10-17 13:30:44 -07:00
Chris Collins
f1b2dd8b1a Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory 
check for empty snapshot dir, and default to temp
 2016-10-17 13:21:58 -07:00
Chris Collins
1c30d98cf9 Merge pull request #8823 from ZappoMan/shutdownSandbox 
Auto-shutdown of sandbox if it was launched by interface
 2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
dcab5a5dbc fix unix warning 2016-10-17 13:12:24 -07:00
Brad Hefta-Gaub
c575e19b81 more CR feedback 2016-10-17 13:09:10 -07:00
Ryan Huffman
1432a7c951 Update gamepad help image 2016-10-17 12:43:39 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Stephen Birarda
edc83f547b only add token for HFWebEngineProfile if present 2016-10-17 11:34:37 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Stephen Birarda
89a4bc8434 add custom QWebEngine request interceptor 2016-10-17 11:34:10 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Howard Stearns
615325c17f check for empty snapshot dir, and default to temp 2016-10-16 12:25:32 -07:00
Howard Stearns
313e3e7b6d git rid of wacky scaling 2016-10-15 18:18:24 -07:00
David Rowe
a767a27e7e Merge branch 'master' into 21070 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-16 14:09:53 +13:00
Andrew Meadows
72ad974b3e improved shape prevents avatar walking up walls 2016-10-15 16:00:02 -07:00
David Rowe
bfc9974fb7 Alter layout of spacebar row 2016-10-15 12:17:59 +13:00
David Rowe
7e4f494e96 Fix no keyboard when renaming item directly in Asset Server dialog 2016-10-15 11:19:38 +13:00
howard-stearns
25f121b462 close button for address bar 2016-10-14 15:10:55 -07:00
David Rowe
c9c5436080 Fix auto scrolling dialogs when keyboard raised 2016-10-15 10:34:54 +13:00
David Rowe
94e20d9a13 Fix login dialog keyboard 2016-10-14 14:29:14 +13:00
David Rowe
0e3cb3eabf Merge branch 'master' into 21070 2016-10-14 13:29:38 +13:00
Anthony J. Thibault
81db8f7e08 Merge branch 'master' into out-of-body-experience 2016-10-13 17:27:15 -07:00
Chris Collins
90b283f83b Merge pull request #8806 from huffman/fix/atp-script-cache 
Update ScriptCache to clear ATP assets when disconnected from a domain
 2016-10-13 16:30:29 -07:00
David Rowe
8f42a3fe9e Fix keyboard state in browser when switching focus to/from dialog frame 2016-10-14 12:14:23 +13:00
Ryan Huffman
decb94b719 Update ScriptCache to clear ATP assets when disconnected from a domain 2016-10-13 14:05:53 -07:00
David Rowe
64c54f9c6b Fix keyboard in new browser window opened from Web view 2016-10-14 10:03:52 +13:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Brad Hefta-Gaub
37e58d123e Merge pull request #8793 from AndrewMeadows/recenter-above-ground2 
prevent avatar from recentering below ground
 2016-10-13 13:50:06 -07:00
Chris Collins
7ec1e05165 Merge pull request #8791 from hyperlogic/bug-fix/avatar-hold-action-deadlock-fix 
Deadlock fix in avatar grab action.
 2016-10-13 13:48:28 -07:00
Chris Collins
635e3d1ea1 Merge pull request #8796 from hyperlogic/bug-fix/avatar-hold-action-crash-on-exit 
Prevent crash on exit.
 2016-10-13 13:23:43 -07:00
Chris Collins
b41d72a9fd Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes 
Bug fixes in oculus_touch default mapping
 2016-10-13 10:57:27 -07:00
David Rowe
2343e02454 Fix a couple of QML errors 2016-10-13 18:16:21 +13:00
David Rowe
a75925d1e3 Add numeric shift 2016-10-13 14:18:21 +13:00
Anthony J. Thibault
f0dba9e766 Prevent crash on exit. 
If you or another user begins to near-grab an object while you exit the application, you might run into this crash.
The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's.
When it is destroyed, via the Application destructor, it will release these pointers.
This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager.
However at this point the AvatarManager has already been destroyed, leading to a null dereference.

The fix is to check the AvatarManager pointer first.
 2016-10-12 16:29:05 -07:00
David Rowe
2ef974f729 Fix alphabetic shift 2016-10-13 12:16:02 +13:00
David Rowe
4dfe290d4a Add comma and period keys to last row of keyboard 2016-10-13 12:02:36 +13:00
David Rowe
5d390b4722 Revise positions of keys in keyboard 2016-10-13 11:45:14 +13:00
David Rowe
a359626316 Merge branch 'master' into 21070 2016-10-13 09:54:59 +13:00
David Rowe
e269a84d0e Add placeholder "FIXME"s for making Web entity keyboard HMD-only 2016-10-13 09:35:39 +13:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
Andrew Meadows
867fc3ccbf prevent avatar from recentering below ground 2016-10-12 13:23:44 -07:00
Anthony J. Thibault
aa52963e5d Made the Grip buttons less sensitive to inadvertent squeezes. 2016-10-12 12:59:43 -07:00
David Rowe
18f19b07d4 Fix checkbox not being disabled per dropdown default 
And tweak checkbox position.
 2016-10-13 08:37:30 +13:00
Anthony J. Thibault
ba4c356d7f Deadlock fix in avatar grab action. 
Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them.
The network thread does this when hold actions from other avatars are received.
 2016-10-12 11:05:19 -07:00
Atlante45
d5429e76da Warnings fixes and cleanup 2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
David Rowe
86f6cee2ad Fix Asset Browser add-to-world drop-down 2016-10-12 20:08:33 +13:00
David Rowe
ee31e3b896 Fix Asset Browser add-to-world with spaces unwittingly appended to names 2016-10-12 20:08:15 +13:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Andrew Meadows
ef465d4443 prevent avatar from recentering below ground 2016-10-11 16:37:29 -07:00
Brad Hefta-Gaub
f532affdf3 hardwire xbox to match help 2016-10-11 14:39:45 -07:00
David Rowe
49709b42d7 Merge branch 'master' into 21070 2016-10-12 09:45:34 +13:00
David Rowe
31b35f0a35 Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07:00
Anthony J. Thibault
ace8639f5b Bug fixes in oculus_touch default mapping 
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
  with the handControllerGrab script.  Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
 2016-10-10 18:42:06 -07:00
David Rowe
552f276a06 Load avatar browser dialog such that JavaScript EventBridge works 2016-10-11 11:12:57 +13:00
David Rowe
d0900ec75e Add keyboard to avatar browser dialog 2016-10-11 10:11:36 +13:00
Chris Collins
2b8765b47e Merge pull request #8765 from ctrlaltdavid/fix-address-bar 
Fix address bar not being able to regain focus
 2016-10-10 10:11:34 -07:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
David Rowe
12f4b2854d Fix address bar not being able to regain focus 2016-10-08 19:38:57 +13:00
David Rowe
5a4665b02f Combine numeric keys into alpha keyboard QML file for scrolling windows 2016-10-08 16:27:51 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
David Rowe
a934f59c2a Fix virtual keyboard in login dialog 2016-10-08 13:37:31 +13:00
Ryan Huffman
6476dfecc6 Update help window images 2016-10-07 16:06:26 -07:00
Andrew Meadows
55c90e7bca Merge branch 'master' into out-of-body-experience 2016-10-07 15:18:08 -07:00
Ryan Huffman
c995e51128 Fix compilation bugs in Application 2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396 Remove unnecessary lambda for location initialization on startup 2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e Update initial run logic 2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa Add redirection to entry on first turn if you don't have Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9 Fix location that server content version is looked for 2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc Fix tutorial begin location 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c Update logic for going to tutorial on launch 2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613 Remove unused variable 2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47 Set default preferred device to vive and rift 2016-10-07 10:30:18 -07:00
Ryan Huffman
9f53652dfb Add routing of new users to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
David Rowe
c76bb01359 Make Interface title say if user not logged in 2016-10-07 15:39:46 +13:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
Ryan Downe Karpf
877d62069e Merge pull request #8750 from ctrlaltdavid/21066 
QA READY: Improve address bar address entry
 2016-10-06 14:45:25 -07:00
David Rowe
b6221a5f83 Fix clearing address bar after navigating using picture card 2016-10-07 09:45:34 +13:00
Ryan Huffman
a74b8f3f24 Update help window images 2016-10-06 13:37:56 -07:00
Ryan Huffman
508950841b Adjust the img size in help.html 2016-10-06 13:22:59 -07:00
Ryan Huffman
e59069fe35 Update help window images 2016-10-06 13:00:07 -07:00
Chris Collins
80ecf88935 Merge pull request #8731 from huffman/feat/interface-run-server 
Add flag to interface to have it start the sandbox server
 2016-10-06 09:18:41 -07:00
Ryan Huffman
246a816b80 Update help window tabs to activate on mouse down instead of up 2016-10-05 22:54:39 -07:00
David Rowe
1ee9317234 Fix clearing address and cursor upon address bar closing 2016-10-06 17:00:25 +13:00