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

4372 commits

Author SHA1 Message Date
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
Ryan Huffman
202326dbac Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager 2018-12-19 12:03:30 -08:00
Ryan Huffman
c2aca64b11 Add start of opening uploaded avatar in inventory 2018-12-19 11:30:21 -08:00
Thijs Wenker
cb74313de8 create projects / style changes 2018-12-19 19:23:24 +01:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems 
Fix MS20308: Allow users to checkout uncertifiable items
 2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b Fix MS20308: Allow users to checkout uncertifiable items 2018-12-14 11:17:56 -08:00
Shannon Romano
131b53e4df
Merge pull request #14315 from wayne-chen/loginInitiative2 
2nd initiative for encouraging login
 2018-12-14 01:59:35 +00:00
Ryan Huffman
2269447741 Fix AvatarPackager QML size 2018-12-13 15:27:10 -08:00
Shannon Romano
3e10bea1ce
Merge pull request #14567 from davidkelly/dk/18639 
Return more connections in pal
 2018-12-13 22:48:00 +00:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Ryan Huffman
78c4c2599e Add start of marketplace uploading and project file list 2018-12-13 13:27:31 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Wayne Chen
a2ebb67cd5 dev feedback/fixing keyboard in profile creation 2018-12-12 17:33:22 -08:00
Wayne Chen
67fe05da97 fixing spacing 2018-12-12 15:31:33 -08:00
Wayne Chen
b4e2b74f3d adding text wrapping/fixing keep me logged in setting 2018-12-12 15:27:42 -08:00
Wayne Chen
941050d42c fixing tablet apps/referenceerror 2018-12-12 12:43:01 -08:00
Thijs Wenker
96673bb5b9 show project page 2018-12-12 21:15:44 +01:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Thijs Wenker
c0bd9121fb open avatar projects 2018-12-12 19:55:14 +01:00
Wayne Chen
941df8bc35 attempting fix on losing logged in setting 2018-12-12 10:08:50 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Wayne Chen
f63c1b3fc5 dismiss dialog only if login dialog popped up 2018-12-11 15:42:35 -08:00
David Kelly
b2645bc23b Return more connections in pal 2018-12-11 14:47:18 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Zach Fox
75ba1cb3c7 I forgot to clear dot immediately 2018-12-11 10:30:12 -08:00
Thijs Wenker
3943fe2861 avatar packager initial 2018-12-10 21:29:03 +01:00
Wayne Chen
e53e8435eb more fixing of logging in 2018-12-10 11:51:34 -08:00
Wayne Chen
2a37ed21b2 more centering 2018-12-10 11:16:31 -08:00
Wayne Chen
5c354c4bc7 centering logged in text 2018-12-10 11:13:55 -08:00
Wayne Chen
c80f7c5a29 fixing typos 2018-12-10 10:55:02 -08:00
Wayne Chen
f11c60d9ff Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-10 10:52:14 -08:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory 
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
 2018-12-10 10:49:06 -08:00
Wayne Chen
3c4382773a fixing code for max height/width 2018-12-09 07:56:09 -08:00
Wayne Chen
a787b39cae Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 17:39:51 -08:00
Wayne Chen
23d3b96446 add spinner/design updates/fix steam link 2018-12-07 15:17:33 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1 
Pay-Out API Frontend, Part One
 2018-12-06 15:25:54 -08:00
Wayne Chen
1a86b8d172 50% opacity/bold shortcut text 2018-12-06 14:58:39 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00