Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 11:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47407 commits 71 branches 56 tags 1.2 GiB
Commit graph

47407 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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 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
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
David Rowe
bfc9974fb7 Alter layout of spacebar row 2016-10-15 12:17:59 +13:00
David Rowe
eff8502f67 Merge branch 'master' into 21070 2016-10-15 11:20:30 +13:00
David Rowe
7e4f494e96 Fix no keyboard when renaming item directly in Asset Server dialog 2016-10-15 11:19:38 +13: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
David Rowe
c9c5436080 Fix auto scrolling dialogs when keyboard raised 2016-10-15 10:34:54 +13: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