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 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
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
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
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
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
David Kelly
5b7f0cb358
Fix for sandbox startup issue
...
Move determinedSandboxState=true until after we spawn it.
2016-10-19 13:51:20 -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
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -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
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
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
Stephen Birarda
f8e0d7ad88
move QWebEngine classes to ui library
2016-10-18 12:53:32 -07:00
Stephen Birarda
c4cec8eb1e
use desktop profile again, move classes to networking subdir
2016-10-18 10:22:31 -07:00
Stephen Birarda
a45677c2a2
mark intercept override, only add header for HTTPS
2016-10-18 10:03:46 -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
Brad Davis
99ed7ac08c
Fix shutdown crash (hopefully)
2016-10-17 17:38:10 -07:00
howard-stearns
7a3c14683e
switchable placeholder for domain-connection failure, currently a modal
2016-10-17 14:50:46 -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
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
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
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
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
Ryan Huffman
decb94b719
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 14:05:53 -07: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
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
Andrew Meadows
867fc3ccbf
prevent avatar from recentering below ground
2016-10-12 13:23:44 -07: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
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07: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
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
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
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
David Rowe
a347936b68
Fix location not being updated after using back and forwards buttons
2016-10-06 16:47:49 +13:00
Chris Collins
bc6797fc3a
Merge pull request #8733 from zzmp/fix/audio-channel-swap
...
fix intermittent channel swapping
2016-10-05 15:54:25 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Zach Pomerantz
afce8c4a45
STEREO_FACTOR -> AudioConstants::STEREO
2016-10-05 13:02:28 -07:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888
Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures
...
Fix model overlay visibility and texture properties
2016-10-05 11:54:11 -07:00
Howard Stearns
32db63e177
Merge pull request #8737 from highfidelity/domain-check
...
Domain check
2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c
Merge pull request #8715 from jherico/offscreen_fences2
...
Support external GL textures with proper fencing
2016-10-05 05:13:06 -07:00
Ryan Huffman
ff8f45d36c
Fix application directory path
2016-10-04 16:47:59 -07:00
Ryan Huffman
224c35d568
Clean up launch server in main.cpp
2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54
Fix server arguments causing crash on startup
2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6
Update server content path to be relative
2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae
Update interface to launch server
2016-10-04 16:47:58 -07:00
Ryan Huffman
847a5cc7a1
Remove old texture setting code in ModelOverlay
2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae
Fix model overlay visible not working
2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817
Fix setting textures in model overlays
2016-10-04 16:24:43 -07:00
Anthony Thibault
60aff44f33
Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix
...
Remove frame lag and jitter from near grabbed physical objects.
2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165
Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls
2016-10-04 10:56:44 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
Anthony J. Thibault
327fcc970b
Remove frame lag from near grabbed physical objects.
...
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.
After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d
Add hmd stats to stats event
2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
howard-stearns
4fcddfdf2b
Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check
2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33
Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus
2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615
Merge branch 'master' into 21055
2016-10-04 08:46:30 +13:00
samcake
0189e3aea7
Github is borked ?
2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b
replace the simple log by a unique log
2016-10-03 11:27:15 -07:00
samcake
0df69b8e15
Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug
2016-10-03 10:06:58 -07:00
Clément Brisset
becee3bba3
Merge pull request #8685 from thoys/ac-fixes
...
Assignment Client fixes
2016-09-30 11:05:58 -07:00
David Kelly
621e3fc000
Expose triggerOption to scripts, plus _physicsEnabled
...
Now any menu item can be triggered. Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such. Whee!
2016-09-30 09:06:17 -07:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
Brad Hefta-Gaub
38eccd32a8
add developer menu support to enable/disable dynamic texture management
2016-09-29 10:18:54 -07:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
Zach Pomerantz
b9c4018b8e
expose AudioStats to qml/js
2016-09-26 15:35:29 -07:00
Chris Collins
be33524990
Merge pull request #8636 from zzmp/clean/audio-config
...
strip unused audio settings, hide the rest
2016-09-23 15:08:48 -07:00
Zach Pomerantz
277eefafd7
remove the audio stats dialog
2016-09-23 14:39:07 -07:00
Zach Pomerantz
d0f4a29031
Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection
2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b
Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config
2016-09-23 13:11:52 -07:00
