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 |
|
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 |
|
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 |
|
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
|
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 |
|
Zach Fox
|
fd6f4b569f
|
Fix active focus issue
|
2018-02-20 13:19:31 -08:00 |
|
Zach Fox
|
eb29bdf5d2
|
Don't allow tabs or newlines
|
2018-02-20 13:06:10 -08:00 |
|
Ryan Huffman
|
acda90577a
|
Merge pull request #11997 from ZappoMan/oldPropsFilters
giving more info to entity edit filters to allow more flexibility
|
2018-02-20 12:57:44 -08:00 |
|
Zach Fox
|
9bde9f5a4f
|
Fix height of Optional Message in Send Money
|
2018-02-20 12:36:11 -08:00 |
|
Dante Ruiz
|
024d5d30c6
|
adding print statment
|
2018-02-20 11:34:24 -08:00 |
|
Dante Ruiz
|
8fc50222f5
|
allow json for uses /~/ for file paths
|
2018-02-20 11:20:42 -08:00 |
|
Seth Alves
|
1f5a65f93e
|
only could a url as a domain if it ends with .domain.json
|
2018-02-20 10:58:43 -08:00 |
|
Seth Alves
|
f80ee1286d
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-20 10:35:31 -08:00 |
|
Seth Alves
|
7f1c445f6d
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-20 10:23:01 -08:00 |
|
John Conklin II
|
6148c407a5
|
Merge pull request #12422 from misslivirose/fix-overlay-lines
Show outline for zones when rotating
|
2018-02-20 09:30:22 -08:00 |
|
John Conklin II
|
aa67a98d02
|
Merge pull request #12426 from ElderOrb/FB11508
fix for toolbar slowly drifting on switching between HMD/Desktop modes
|
2018-02-20 09:30:01 -08:00 |
|
David Rowe
|
44aafd92a4
|
Merge branch 'master' into 21757
# Conflicts:
# scripts/system/html/js/entityProperties.js
|
2018-02-20 17:34:59 +13:00 |
|
ZappoMan
|
76d611d563
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
|
2018-02-19 19:15:33 -08:00 |
|
Seth Alves
|
563c19bb91
|
fix connect
|
2018-02-19 15:21:46 -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 |
|
Sam Gateau
|
fd49c0d100
|
Merge pull request #12401 from SamGondelman/decals
Material Entities
|
2018-02-19 10:58:02 -08:00 |
|
David Rowe
|
65efeadf10
|
Fix selecting values when tabbing between entity properties fields
|
2018-02-19 19:17:23 +13:00 |
|
Brad Hefta-Gaub
|
0ef2794c35
|
Merge pull request #12395 from druiz17/fix-qml-tablet-apps
Prevent adding the same tablet url to the tabletApps list
|
2018-02-18 19:10:24 -08:00 |
|