Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47367 commits 75 branches 59 tags 1.2 GiB
Commit graph

47367 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Brad Davis
0be1f82bbc Fix AMD crash caused by missing glFlush 2016-10-15 15:28:28 -07:00
Seth Alves
72d3a594b2 Merge pull request #8817 from howard-stearns/goto-close 
Goto close
 2016-10-15 08:00:43 -07:00
howard-stearns
140caf84d8 never interact with hud elements while holding something 2016-10-14 18:30:52 -07:00
Stephen Birarda
d1cd99e035 remove a useless two dots 2016-10-14 18:24:39 -07:00
howard-stearns
285ae474f5 Merge branch 'master' of https://github.com/highfidelity/hifi into goto-close 2016-10-14 15:11:27 -07:00
howard-stearns
25f121b462 close button for address bar 2016-10-14 15:10:55 -07: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
Chris Collins
d70b58555e Merge pull request #8794 from howard-stearns/clientOnly-tablet 
make marketplace tablet be clientOnly
 2016-10-14 10:54:54 -07:00
Howard Stearns
fc8bbde60a Merge pull request #8810 from ZappoMan/handControlsWhileLoading 
make laser pointers work even while content is loading
 2016-10-14 10:01:46 -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
Brad Hefta-Gaub
3a0672ba79 Merge pull request #8811 from ZappoMan/improveTeleport 
better handling of the teleport target overlays to prevent flashing
 2016-10-13 22:27:39 -07:00
Brad Hefta-Gaub
652af860ed Merge branch 'master' of https://github.com/highfidelity/hifi into handControlsWhileLoading 2016-10-13 20:54:24 -07:00
Brad Hefta-Gaub
4bcd8008de Merge branch 'master' of https://github.com/highfidelity/hifi into improveTeleport 2016-10-13 20:54:03 -07:00
Brad Hefta-Gaub
964377429a Merge pull request #8800 from jherico/openvr_crash 
Don't crash on OpenVR activation when SteamVR isn't running
 2016-10-13 20:10:55 -07:00
Brad Hefta-Gaub
ef3c9ba78a better handling of the teleport target overlays to prevent flashing and thrashing 2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a make laser pointers work even while content is loading 2016-10-13 17:50:20 -07:00
howard-stearns
d232d115d5 persist tablet data, and clean it up on startup 2016-10-13 16:53:44 -07:00
Brad Davis
ff3d1b3d01 Don't use VR compositor if it doesn't exist 2016-10-13 16:53:37 -07: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
Brad Davis
d4e83a7461 Don't crash on OpenVR activation when SteamVR isn't running 2016-10-13 16:37:50 -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
Stephen Birarda
b2a896a405 Merge pull request #8808 from huffman/fix/change-entry-to-welcome 
Change default hifi address from dev-welcome to welcome
 2016-10-13 16:25:40 -07:00
Ryan Huffman
6cf4802cc2 Change default hifi address from dev-welcome to welcome 2016-10-13 16:06:07 -07:00
Brad Hefta-Gaub
4a318e5498 Merge pull request #8784 from howard-stearns/crowd-animation 
make agent avatar animations work again, and use them in crowds
 2016-10-13 16:02:41 -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
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