Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 08:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64946 commits 74 branches 59 tags 1.2 GiB
Commit graph

3655 commits

Author SHA1 Message Date
Seth Alves
666fa77be2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 13:53:20 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt 
fix Qt 5.10 udt packet reading
 2018-02-26 13:50:41 -08:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
Seth Alves
3be1988260 fix expandToLocalDataAbsolutePath 2018-02-23 14:27:28 -08:00
Seth Alves
50cec08efe look offline when visiting a serverless domain 2018-02-22 13:43:41 -08:00
Seth Alves
d27cbac3f8 loading directly into a serverless domain works. user will have edit permissions 2018-02-21 18:21:45 -08:00
Seth Alves
f44749387a cleanups 2018-02-21 15:24:54 -08:00
Seth Alves
e36f39781b remove some debug prints, fix serverless to servered domain transition 2018-02-21 15:06:23 -08:00
Dante Ruiz
268a7026b4 fix history and double loading of serverlessDomain 2018-02-21 13:41:43 -08:00
Seth Alves
6f70b21126 fix include filename 2018-02-20 16:56:46 -08:00
Dante Ruiz
43ce9508ee better way to handle urls 2018-02-20 14:27:21 -08:00
Dante Ruiz
8fc50222f5 allow json for uses /~/ for file paths 2018-02-20 11:20:42 -08:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Seth Alves
3b99f8d4da Merge branch 'fix-qt-5-10-udt' of github.com:sethalves/hifi into serverless-domains 2018-02-19 12:04:13 -08:00
Seth Alves
25c34403db Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-19 11:24:42 -08:00
Seth Alves
0a92596452 don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false 2018-02-18 10:04:22 -08:00
Seth Alves
7a5415efbe working on getting history to work with serverless domains 2018-02-18 07:55:43 -08:00
Seth Alves
3027d3461e Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown 2018-02-17 15:24:50 -08:00
Seth Alves
10935f2cc2 save non hifi domain urls to settings 2018-02-16 17:31:23 -08:00
Seth Alves
ed5b28aa2a clear octree on any sort of domain change 2018-02-16 17:15:15 -08:00
Dante Ruiz
acaf4f0d1d fix merge conflict 2018-02-16 15:14:18 -08:00
Seth Alves
367d715ff8 set connected flag when going to serverless domain 2018-02-16 15:08:37 -08:00
Dante Ruiz
aea517ddba fix merge conflict 2018-02-16 15:00:08 -08:00
Dante Ruiz
e0bbc57f6c support relative file path from appliaction directory 2018-02-16 14:48:38 -08:00
Seth Alves
de9ac7f4a5 working to integrate serverless domains into history, etc 2018-02-16 13:56:22 -08:00
Seth Alves
b2a4181bc0 working to integrate serverless domains into history, etc 2018-02-16 12:58:50 -08:00
Seth Alves
abc467b919 load json from indicated file to populate serverless domain 2018-02-15 16:09:03 -08:00
Seth Alves
17e2db96c6 make domain-manager and pals be still when interface is in serverless mode 2018-02-15 15:19:50 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup 
Add asset server backups capabilities to the Domain Server
 2018-02-13 17:40:11 -07:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
 2018-02-12 17:50:39 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs 
Misc bug fixes
 2018-02-12 14:31:38 -08:00
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
NissimHadar
950a62f3f8 Global graphics flag default to on. 
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
 2018-02-08 15:52:20 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more 
try harder to bump avatar-mixer protocol version
 2018-02-06 09:12:03 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Seth Alves
14d8259a5e try harder to bump avatar-mixer protocol version 2018-02-05 11:54:48 -08:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Stephen Birarda
eb9d100fc8 reset count on conn refusal, soft reset DH in Interface on limit reached 2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2 reset silent check in packet check on domain connection reset 2018-02-02 13:47:48 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
Elisa Lupin-Jimenez
3d000d3d01 changed packet number 2018-02-02 10:08:39 -08:00
David Rowe
f46362906d Bump avatar mixer packet version 2018-02-02 10:02:20 +13:00