Wayne Chen
d5b7fe62db
modularizing qml font in login
2018-10-23 11:00:42 -07:00
Wayne Chen
56656a9079
adding button font modularity/using cairo
2018-10-23 10:46:19 -07:00
Wayne Chen
2a0a099397
adding steam svg
2018-10-23 10:04:21 -07:00
Wayne Chen
162502923a
image for steam login button
2018-10-23 10:00:35 -07:00
Wayne Chen
c087b0f196
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-23 08:51:45 -07:00
Wayne Chen
137b240a47
more changes to functions
2018-10-22 20:03:12 -07:00
Wayne Chen
84001ae208
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 17:59:33 -07:00
Wayne Chen
1e418e9976
some cleanup in LinkAccountBody
2018-10-22 17:52:03 -07:00
Wayne Chen
736a78061d
button style change/cant access text
2018-10-22 17:44:03 -07:00
Wayne Chen
b33267a63a
more wip
2018-10-22 17:38:12 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-10-22 11:50:09 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting
...
Add a 'grabbable' option to the new-model dialog
2018-10-22 11:42:40 -07:00
Wayne Chen
d7a4531d00
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 09:27:23 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
cd4e9a3e08
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
...
Updating highlight textures on Rift Controller
2018-10-19 16:39:17 -07:00
Wayne Chen
3bd10716b2
wip
2018-10-19 16:06:28 -07:00
Wayne Chen
8c7a5e98f2
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 11:31:43 -07:00
Brad Hefta-Gaub
b281c090e3
Merge pull request #14012 from alexiamandeville/controlImageUpdate
...
Adding handshake control to image in Controls Reference
2018-10-19 11:15:11 -07:00
Wayne Chen
e32460ed96
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 09:25:57 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap
...
Fix MS18154: Don't snap to cards in My Purchases
2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
...
make room for keyboard and help in SendAsset
2018-10-18 17:53:52 -07:00
John Conklin II
b2e84a8f3b
Merge pull request #14191 from howard-stearns/new-rez-images
...
new images for My Purchases rez tutorial
2018-10-18 17:50:30 -07:00
Wayne Chen
5a381fdc03
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-18 14:53:49 -07:00
Alexander Ivash
64f67d5eb7
update imports for utilities / all other qml files found
2018-10-18 22:03:50 +03:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
...
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
Sam Gondelman
121fc7205c
Delete Default-Sky-9-cubemap.texmeta
2018-10-14 22:36:22 -07:00
Howard Stearns
6c6d29152f
new images for My Purchases rez tutorial
2018-10-11 12:36:43 -07:00
Howard Stearns
30971cd766
make room for keyboard and help in SendAsset
2018-10-10 15:43:20 -07:00
Wayne Chen
35eb857ea6
adding non-working login screen
2018-10-09 16:30:47 -07:00
Wayne Chen
3488763d94
reverting login dialog stuff
2018-10-09 16:29:56 -07:00
Wayne Chen
91e34a305c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-08 16:46:45 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
Wayne Chen
83d683de7a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-08 08:52:38 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
Wayne Chen
2d85f882b8
adding buttons
2018-10-02 17:47:09 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
Wayne Chen
e254324dbd
Merging more files
2018-10-01 16:47:10 -07:00
Wayne Chen
72851acd8b
adding spacer/close button pos
2018-10-01 16:44:01 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
