Atlante45
bad96d54ea
TCP congestion control first draft
2016-10-18 15:54:25 -07:00
Howard Stearns
5e697462ef
Merge pull request #8846 from ctrlaltdavid/fix-card-z-order
...
Fix suggestion card appearing behind keyboard
2016-10-18 15:01:03 -07:00
David Rowe
c8e9e4ecd0
Fix suggestion card appearing behind keyboard
2016-10-19 10:13:07 +13:00
Brad Hefta-Gaub
d59c026ded
Merge pull request #8842 from huffman/fix/empty-urls
...
Fix bug in Script.include when urls is empty
2016-10-18 12:09:18 -07:00
Ryan Huffman
73a0266edb
Fix case in Script.include where urls is empty
2016-10-18 11:41:15 -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
Brad Hefta-Gaub
c8fa2e3c9a
Merge pull request #8831 from hyperlogic/bug-fix/fbxreader-crash-fix
...
Speculative fix for crash in FBXReader.cpp
2016-10-18 01:08:29 -07:00
Brad Hefta-Gaub
f9054bef9b
Merge pull request #8816 from davidkelly/dk/1811
...
CellScience play button doesn't play anything
2016-10-17 21:20:57 -07:00
Brad Hefta-Gaub
478c0856f3
Merge pull request #8837 from sethalves/fix-avatar-entities-delete
...
fix crash when deleting avatar-entities
2016-10-17 21:20:27 -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
Chris Collins
b43301cd8c
Merge pull request #8824 from huffman/fix/batch-load-crash
...
Fix race condition in BatchLoader
2016-10-17 20:55:38 -07:00
Chris Collins
73bee7efc1
Merge pull request #8834 from Atlante45/place-name
...
Don't override place name path with index path
2016-10-17 20:53:05 -07:00
Seth Alves
5d085798cb
Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entities-delete
2016-10-17 17:42:17 -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
Ryan Downe Karpf
6ae6fc4057
Merge pull request #8836 from howard-stearns/explicit-disconnnect-dialog
...
switchable placeholder for domain-connection failure, currently a modal
2016-10-17 16:30:23 -07:00
Seth Alves
9b7086b1fb
added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue
2016-10-17 16:11:37 -07:00
Zach Pomerantz
301f3ced98
fix typoed threaded call
2016-10-17 15:30:49 -07:00
howard-stearns
7a3c14683e
switchable placeholder for domain-connection failure, currently a modal
2016-10-17 14:50:46 -07:00
Atlante45
3955c6c4c6
Don't override place name path with index path
2016-10-17 14:41:05 -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
Anthony J. Thibault
1c6fbc08bf
Speculative fix for crash in FBXReader.cpp
...
I could not reproduce the issue, however looking at the stack trace shows that
the crash is due to indexing past the end of the FBXNode::properties QVariantList.
Guard against this from happening by checking the property length first.
2016-10-17 13:22:17 -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
Chris Collins
5b9606f0fc
Merge pull request #8826 from zzmp/fix/failed-oculus-gl
...
avoid uninitialized oculus gl calls
2016-10-17 13:11:16 -07:00
Ryan Huffman
9ef6aee3d1
Fix race condition in BatchLoader
2016-10-17 13:10:19 -07:00
Brad Hefta-Gaub
c575e19b81
more CR feedback
2016-10-17 13:09:10 -07:00
Ryan Downe Karpf
2e64e46a7e
Merge pull request #8827 from huffman/fix/equip-sphere
...
Fix equip sphere not showing up
2016-10-17 13:04:12 -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
Zach Pomerantz
876f70709e
change oculus init errors to critical
2016-10-17 11:57:32 -07:00
Zach Pomerantz
2191903803
avoid uninitialized oculus gl calls
2016-10-17 11:08:38 -07:00
Ryan Huffman
5f5dedaa40
Fix equip sphere not showing up
2016-10-17 10:53:02 -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
Brad Hefta-Gaub
aec76cd542
Merge pull request #8799 from ctrlaltdavid/21070
...
HMD keyboard polishing
2016-10-16 01:00:48 -07:00
Brad Hefta-Gaub
268cc098cd
Merge pull request #8819 from howard-stearns/no-hud-interaction-while-grabbing
...
never interact with hud elements while holding something
2016-10-15 19:29:40 -07:00
Brad Hefta-Gaub
3874f173b6
Merge pull request #8818 from jherico/amd_crash
...
Fix AMD crash caused by missing glFlush
2016-10-15 18:47:25 -07:00
Clément Brisset
281074f1d3
Merge pull request #8797 from birarda/slow-localhost
...
fixes for various networking/ATP stuck download failure cases
2016-10-15 18:11:02 -07:00
David Rowe
a767a27e7e
Merge branch 'master' into 21070
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2016-10-16 14:09:53 +13:00
Brad Hefta-Gaub
991bd04f5d
Merge pull request #8821 from howard-stearns/cell-science-ac-speed
...
fix cellscience ac script load
2016-10-15 18:06:49 -07:00
Brad Davis
612a1b17ff
Magic number removal
2016-10-15 17:59:27 -07:00
Howard Stearns
e5c6fcaa70
Get Cells and vesicles just once, 20 seconds after we start querying (and shut down queries).
2016-10-15 17:01:19 -07:00
