Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 10:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65804 commits 76 branches 59 tags 1.2 GiB
Commit graph

3717 commits

Author SHA1 Message Date
Seth Alves
afcbb6751b disable loading of serverless-domains over http(s), for now 2018-03-14 15:53:35 -07:00
Seth Alves
e63558dc05 code review 2018-03-14 14:33:17 -07:00
Seth Alves
93978209d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-14 13:49:46 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr 
Fixes for missing avatar on record replays
 2018-03-13 14:10:10 -07:00
Seth Alves
274c3224a2 fix going to a dns name or ip address 2018-03-09 16:58:50 -08:00
Seth Alves
e102db109d unmange merge 2018-03-09 13:04:50 -08:00
Seth Alves
621e6a62d6 merge from upstream 2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c merge from upstream 2018-03-09 12:03:26 -08:00
Brad Hefta-Gaub
6b55fa1fcd
Merge pull request #12539 from ctrlaltdavid/21702 
Remove deprecated Window.location.protocolVersion() function from API
 2018-03-09 08:52:55 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Seth Alves
6c831bbc3a Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-08 07:42:30 -08:00
Seth Alves
7d7570798b oops, forgot to flip booleans along with logic 2018-03-07 18:31:13 -08:00
Seth Alves
4ed0c24a73 use static QStrings rather than functions 2018-03-07 18:25:55 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
Seth Alves
12eb0e4109 name emit from AddressManager like an event 2018-03-07 15:36:35 -08:00
Seth Alves
4505fce508 use const QUrls rather than functions 2018-03-07 13:39:44 -08:00
Simon Walton
17c12fde9c Fix for HandshakeRequest logic 2018-03-06 16:32:04 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Seth Alves
79aa450332 some code-review induced changes 2018-03-06 13:11:09 -08:00
Simon Walton
547d86a2d5 Improve debugging diagnostic 2018-03-05 18:10:15 -08:00
Simon Walton
8fb3015ec8 Fix for missing avatar on second replay 
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
 2018-03-05 16:51:05 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-05 11:36:39 -08:00
Seth Alves
a6c3bcd8d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-05 08:51:12 -08:00
Seth Alves
dabdff9b2b don't add extra entry in history when going 'back' from a serverless domain 2018-03-03 08:33:42 -08:00
Seth Alves
606face7c0 gather together the url scheme constants, name them consistently 2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-02 19:27:53 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b fix placename in title-bar, fix domain-spawning-point 2018-03-02 09:54:54 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
David Rowe
7107e1539f Remove deprecated Window.location.protocolVersion() function from API 2018-03-02 13:45:31 +13:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Seth Alves
b18993e09f put serverless domain into history if going to a different serverless domain 2018-03-01 12:19:42 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings 
Add content archives to domain server web interface
 2018-02-27 13:30:53 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Gabriel Calero
efba05b9a0 Merge branch 'android' into android_bubble_fix 2018-02-27 16:23:51 -03:00
Seth Alves
9a25128b44 remove some leftover code 2018-02-27 09:39:15 -08:00
Seth Alves
7976a1f95e make localhost work again 2018-02-27 09:24:48 -08:00
Stephen Birarda
aa7bd2066a Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-26 17:02:00 -08:00
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
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00