howard-stearns
963fd68cd9
remove backwards compatability
2016-10-24 11:06:32 -07:00
howard-stearns
4c4ec37eb3
add home portal entity script and make it go to correct welcome
2016-10-24 10:28:32 -07:00
Ryan Huffman
b5881146df
Merge pull request #8878 from zzmp/fix/half-sec-audio-crash
...
reduce sound from crashed avatars
2016-10-23 20:38:35 -07:00
Brad Hefta-Gaub
8efa394bfa
Merge pull request #8886 from jherico/more_gpu_stats
...
Add free GPU memory to the displayed stats
2016-10-23 20:33:15 -07:00
Brad Davis
861b69aa94
Add free GPU memory to the displayed stats
2016-10-23 13:07:38 -07:00
Brad Hefta-Gaub
d5e4c67b02
Merge pull request #8884 from jherico/more_gpu_stats
...
Add more GPU stats, make stats easier to read
2016-10-22 21:51:58 -07:00
Brad Davis
7879bf37f2
Fix typo in comment
2016-10-22 18:12:40 -07:00
Brad Davis
b572fb2a91
Only use sparse texture memory for the memory pressure calculation (since that's all we can modify)
2016-10-22 14:49:10 -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
Brad Hefta-Gaub
61eb9711ed
Merge pull request #8882 from davidkelly/dk/2006
...
Heartbeats need to happen while waiting for sandbox
2016-10-21 17:39:23 -07:00
Brad Davis
e9ac110072
Correct mip calculation
2016-10-21 17:05:56 -07:00
Zach Pomerantz
3bea1069f2
fix unit conversion for audio fade factor
2016-10-21 16:10:33 -07:00
David Kelly
bdcb58bf8b
Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1
...
fix some data-races in logging system
2016-10-21 15:33:40 -07:00
David Kelly
56c11a655a
Merge pull request #8877 from sethalves/fix-ACs
...
undo bad script-engine AC change
2016-10-21 15:25:35 -07:00
Anthony J. Thibault
84d7eef4ba
Remove atp-extract.py
2016-10-21 15:22:16 -07:00
Anthony J. Thibault
ae301602e7
Fix for incorrect tip texture URLs.
2016-10-21 14:49:46 -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
Brad Davis
1bd398ae5e
Report offscreen texture memory usage in stats
2016-10-21 11:31:37 -07:00
Seth Alves
5660063702
code review
2016-10-21 11:05:50 -07:00
Seth Alves
5af8dfdfbd
move ScriptEngines to Agent
2016-10-21 10:57:58 -07:00
Seth Alves
30f29d1796
move ScriptEngines to Agent
2016-10-21 10:57:22 -07:00
Seth Alves
e988941d14
undo bad script-engine AC change
2016-10-21 10:53:13 -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
Chris Collins
8481d0baa5
Merge pull request #8872 from birarda/master
...
always go to dev welcome when not using stable services
2016-10-21 06:16:26 -07:00
Anthony J. Thibault
5d7f79ab00
Added atp-extract.py tool
2016-10-20 18:25:29 -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
Howard Stearns
ca0d6587b5
Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers
...
edit.js: Fix for picking and manipulating objects via hand controllers.
2016-10-20 16:59:56 -07:00
Philip Rosedale
8c5dd1170e
Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker
...
fix flicker in system (inside the hud) hand-lasers.
2016-10-20 16:53:57 -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
Chris Collins
414a79d986
Merge pull request #8868 from huffman/fix/away-overlays
...
Remove showing of overlays in away.js
2016-10-20 16:42:05 -07:00
Stephen Birarda
5886996bc3
always go to dev-welcome when not using stable services
2016-10-20 16:29:40 -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
howard-stearns
0141110805
fix flicker in system (inside the hud) hand-lasers.
2016-10-20 15:42:19 -07:00
Chris Collins
d431081da6
Merge pull request #8866 from sethalves/fix-crash-on-startup-2025
...
fix crash on startup
2016-10-20 13:56:46 -07:00
Brad Davis
c27ee634ea
Fix debug compile issues
2016-10-20 13:56:01 -07:00
Seth Alves
96445f4dee
Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment
...
Added attachment support to crowd-agent
2016-10-20 13:44:25 -07:00
Anthony J. Thibault
53864abaf2
edit.js: Fix for picking and manipulating objects via hand controllers.
...
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
2016-10-20 13:37:31 -07:00
Ryan Downe Karpf
f0766c76e1
Merge pull request #8865 from howard-stearns/fix-resize-on-plugin-switch
...
fix resize on plugin switch
2016-10-20 12:40:31 -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
Ryan Huffman
fad0607bf6
Remove showing of overlays in away.js
2016-10-20 11:49:23 -07:00
Seth Alves
b31acc421a
fix crash on startup
2016-10-20 10:36:14 -07:00
David Kelly
ab02fd79a0
since we know the state, use that boolean
2016-10-20 10:12:26 -07:00
Seth Alves
8ac799ddaf
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb
Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0
...
Fix some audio mixer data races
2016-10-20 10:01:26 -07:00
