Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 19:11:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47393 commits 26 branches 28 tags 1.2 GiB
Commit graph

19466 commits

Author SHA1 Message Date
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
3874f173b6 Merge pull request #8818 from jherico/amd_crash 
Fix AMD crash caused by missing glFlush
 2016-10-15 18:47:25 -07:00
Brad Davis
612a1b17ff Magic number removal 2016-10-15 17:59:27 -07:00
Brad Davis
0be1f82bbc Fix AMD crash caused by missing glFlush 2016-10-15 15:28:28 -07:00
Stephen Birarda
d1cd99e035 remove a useless two dots 2016-10-14 18:24:39 -07:00
David Rowe
eff8502f67 Merge branch 'master' into 21070 2016-10-15 11:20:30 +13:00
Stephen Birarda
9184a500a0 move faked handshake logic to Socket for handshake req flag 2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9 only emit client connection reset on requested handshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55 fix magic numbers and hide sendFakedHandshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2 fix for dual alias in LimitedNodeList std::bind 2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c remove define of UDT connection debug 2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f make faked handshake request usable in dev/PR 2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1 bubble up receiver handshake from udt::Connection 2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479 add forced kill of AS for test 2016-10-14 14:46:58 -07:00
Stephen Birarda
5704335b66 add quick fails for no active socket to other AssetClient calls 2016-10-14 14:46:58 -07:00
Stephen Birarda
055df48e8d make the asset server a solo node type 2016-10-14 14:46:58 -07:00
Stephen Birarda
7fd25ae450 fix returns for missing active socket in LNL 2016-10-14 14:46:58 -07:00
Stephen Birarda
3c70a25a40 immediately error in AssetClient if no active socket for AS 2016-10-14 14:46:58 -07:00
Stephen Birarda
ca94fbc219 refuse to send packets if connection should not be created 2016-10-14 14:46:58 -07:00
Stephen Birarda
f41188b0e8 default last receiver response in send queue to queue creation time 2016-10-14 14:46:58 -07:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Brad Hefta-Gaub
fb47b42ea5 Merge pull request #8807 from sethalves/fix-import-with-tmp-rez 
fix entity-import with only tmp-rez rights
 2016-10-13 22:32:02 -07:00
David Rowe
0e3cb3eabf Merge branch 'master' into 21070 2016-10-14 13:29:38 +13:00
Brad Davis
46326ed27c Fix crash in switching to plugin that uses the composite framebuffer in customizeContext 2016-10-13 16:46:02 -07:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -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
6cf4802cc2 Change default hifi address from dev-welcome to welcome 2016-10-13 16:06:07 -07:00
Ryan Huffman
7626f49ddc Replace qDebug with qCDebug in ScriptCache 2016-10-13 15:43:28 -07:00
Seth Alves
01c1cb328f don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP 2016-10-13 15:05:13 -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
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries 
Update ds path queries to be reliable
 2016-10-13 09:21:44 -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
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
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Brad Davis
4e0fffb8b7 Merge pull request #8779 from gcalero/shaders_gl_es 
Adapt shader for GL ES support
 2016-10-12 08:32:50 -07:00
Brad Hefta-Gaub
0f1e61e240 Merge pull request #8781 from ZappoMan/tweakGrabPoint 
adjust grab indicators
 2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub
8e8eba5e0c Merge pull request #8770 from jherico/textures_tweak 
Fix GPU texture counter, better logging for memory pressure
 2016-10-11 21:36:03 -07:00
Brad Hefta-Gaub
cded9c03f9 Merge pull request #8767 from ZappoMan/viveControllerFixes 
fix 'any endpoints' for axis style inputs
 2016-10-11 20:33:35 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Stephen Birarda
33e426bfd2 Merge pull request #8778 from Atlante45/asset-client 
Fix crash in AssetClient handleProgressCallback
 2016-10-11 18:36:23 -07:00
Brad Davis
8f42e564b4 Disable 'min free GPU memory', bump max texture memory 65% 2016-10-11 16:34:54 -07:00
Brad Davis
1e7dd7db64 Fix GPU texture counter, better logging for memory pressure 2016-10-11 16:28:16 -07:00
samcake
3ebab3b017 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-10-11 15:45:10 -07:00
Brad Hefta-Gaub
95c1237f66 Merge pull request #8776 from samcake/color 
Add check for bad texture resource slot
 2016-10-11 14:50:56 -07:00
samcake
7ea790aa4f adding a comment to explain what we are doing 2016-10-11 14:43:41 -07:00
Stephen Birarda
a8568ac821 Merge pull request #8775 from birarda/master 
remove AssetResourceRequest timeout, output occasional progress to log
 2016-10-11 14:31:51 -07:00
Brad Hefta-Gaub
c1763da9b1 Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash 
Fix crash when switching to desktop mode from oculus HMD mode
 2016-10-11 14:29:28 -07:00