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

64728 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
07b0431215 fix merge conflict 2018-02-23 14:00:36 -08:00
Dante Ruiz
7ea4042fd3 remove unnessary files 2018-02-23 11:52:28 -08:00
Dante Ruiz
73ea0dbc05 use resources path instead 2018-02-23 11:51:31 -08:00
Seth Alves
72234970e3 set sessionUUID for a serverless domain to random rather than AVATAR_SELF_ID 2018-02-22 14:38:46 -08:00
Seth Alves
804ab855d7 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 14:16:15 -08:00
Seth Alves
fdd2b0de15 increment _fullSceneReceivedCounter++ after loading a serverless domain. fix some indentation. 2018-02-22 14:16:11 -08:00
Seth Alves
c7081b28e6 when connected to a serverless domain, set the sessionUUID to be AVATAR_SELF_ID 2018-02-22 14:14:55 -08:00
Seth Alves
50cec08efe look offline when visiting a serverless domain 2018-02-22 13:43:41 -08:00
Seth Alves
c5584432c7 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:40:18 -08:00
Seth Alves
d436197291 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:27:37 -08:00
Seth Alves
f17fa684f5 fix import of zones with skyboxes 2018-02-22 10:27:30 -08:00
Seth Alves
1ce9b56da2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 10:16:47 -08:00
Seth Alves
036b3145c5 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-22 10:16:39 -08:00
Seth Alves
7974857cea
Merge pull request #21 from druiz17/serverless-domains 
allow Octree to load compressed gz files
 2018-02-22 10:14:44 -08:00
Dante Ruiz
d394c891c5 allow Octreee to load compressed gz files 2018-02-22 10:10:54 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -08:00
Seth Alves
496b637325 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 09:39:34 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Seth Alves
c83dcbc626 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-22 07:42:49 -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
John Conklin II
37645022f6
Merge pull request #12344 from ctrlaltdavid/21739 
Recording app fixes
 2018-02-21 17:03:54 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -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
Seth Alves
15a3babda9 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-21 13:46:41 -08:00
Seth Alves
e6b305c09c Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-21 13:46:37 -08:00
Seth Alves
07f5399326
Merge pull request #20 from druiz17/serverless-domains 
Fix history and double loading of serverless domain.
 2018-02-21 13:46:25 -08:00
Dante Ruiz
f93df243db Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-21 13:41:56 -08:00
Dante Ruiz
268a7026b4 fix history and double loading of serverlessDomain 2018-02-21 13:41:43 -08:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00
Seth Alves
dee6afebea Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-21 12:54:46 -08:00
Seth Alves
37e16d2e6d don't save up edit packets when loading a serverless domain 2018-02-21 12:54:41 -08:00
Sam Gateau
0af8507ce2
Merge pull request #12453 from SamGondelman/materialUI 
Fix new material UI indentation
 2018-02-21 12:14:32 -08:00
SamGondelman
4dde178b93 fix new material UI 2018-02-21 10:33:15 -08:00
John Conklin II
9ba1532c26
Merge pull request #12446 from sethalves/more-logging-for-fb-11748 
more logging for fogbugz 11748
 2018-02-21 09:49:51 -08:00
Seth Alves
cfbe082074
Merge pull request #12438 from ctrlaltdavid/21757 
Fix selecting values when tabbing between entity properties fields
 2018-02-21 09:22:46 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome 
Make sure Flickable for GridView for TabletHome will not flick
 2018-02-21 09:21:45 -08:00
John Conklin II
9e1ea191b3
Merge pull request #12443 from zfox23/commerce_SendMoneyUiFix1 
Commerce: Wallet/Send Money UI fixes
 2018-02-21 09:02:13 -08:00
John Conklin II
92249a2bee
Merge pull request #12396 from ElderOrb/double-connection-fix 
fix 4x 'fromQml' slots execution
 2018-02-21 09:01:47 -08:00
Seth Alves
c5d6f0e10f don't queue up edit packets while connected to a serverless domain 2018-02-20 17:48:14 -08:00
Seth Alves
6f70b21126 fix include filename 2018-02-20 16:56:46 -08:00
Seth Alves
05e97a8401 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-20 16:29:07 -08:00
Seth Alves
d4a1f6181a Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-20 16:29:00 -08:00
Seth Alves
b58530fc57
Merge pull request #19 from druiz17/serverless-domains 
allow json to use /~/ for file paths
 2018-02-20 16:28:50 -08:00
Seth Alves
bf73df1265 more logging for fogbugz 11748 2018-02-20 15:45:47 -08:00
Dante Ruiz
43ce9508ee better way to handle urls 2018-02-20 14:27:21 -08:00