Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 07:20:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75274 commits 72 branches 59 tags 1.2 GiB
Commit graph

5784 commits

Author SHA1 Message Date
Ryan Huffman
9955de6288 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 11:43:49 -08:00
Ryan Huffman
748135eef9 Fix login-required size and projectFiles warning 2018-12-21 11:43:20 -08:00
Thijs Wenker
ad2d9bc79a - fst read/write should work 
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
 2018-12-21 19:34:54 +01:00
Thijs Wenker
1da5b3fae2 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 19:20:16 +01:00
Ryan Huffman
7602da6f92 Add AvatarProjectUpload.qml 2018-12-21 08:16:18 -08:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6 Update uploader screen 2018-12-20 16:30:08 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
Thijs Wenker
79a9c82168 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-20 18:56:33 +01:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge 
MS20253: Only emit screenChanged once screen has changed
 2018-12-20 08:58:53 -08:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Zach Fox
b0ce3a54d5 Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash 2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff Un-wear things when trashing them if worn 2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3 Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash 2018-12-19 15:03:36 -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
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -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
Zach Fox
7fee0fc1e4 Fix MS20253: Only emit screenChanged once screen has changed 2018-12-19 09:50:52 -08:00
Zach Fox
116edcc224
I have no idea how this happened 2018-12-19 09:36:05 -08:00
sam gateau
9c436bc28c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-19 09:31:41 -08:00
Jeff Clinton
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355 
FB19355 - When I have avatar entities as children of my avatar, the A…
 2018-12-19 09:09:54 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00
sam gateau
265b1591d6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-18 14:43:12 -08: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
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
vladest
63aa27475e Merge branch 'master' into avatar_app_warnings 2018-12-15 19:08:56 +01: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
Zach Fox
dff7804cdc Change username to trashbot 2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098 Implement MS20187: Add trash can feature to Inventory 2018-12-11 15:44:42 -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
vladest
c05e3e7d09 Fix Avatar apps warnings. Added notification for HMD.active property 2018-12-08 19:12:02 +01:00
Wayne Chen
a787b39cae Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 17:39:51 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
Wayne Chen
23d3b96446 add spinner/design updates/fix steam link 2018-12-07 15:17:33 -08:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3 2018-12-07 14:26:59 -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
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -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
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc cleaning up commented code 2018-12-06 09:04:57 -08:00
Wayne Chen
f8a55a9196 25% opacity from PM req/fixing error message in profile body 2018-12-05 19:42:44 -08:00
Wayne Chen
a3a575acd1 updating background img binaries 2018-12-05 19:12:21 -08:00
Wayne Chen
f7265378bd updating background img 2018-12-05 19:11:58 -08:00
Wayne Chen
037abd9b5e don't allow PC keyboard in HMD login/fix sign up password 2018-12-05 18:14:59 -08:00
Zach Fox
235b27a198 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308 Secret to Coupon ID 2018-12-05 16:34:53 -08:00
Alexander Ivash
090bc4fc0d FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables 2018-12-05 23:33:34 +03:00
Wayne Chen
27e4e1c245 pitch updates login pos/fix signup errors 2018-12-05 11:24:27 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
Wayne Chen
eb51a5b7b6 changing opacity to 0.5 2018-12-05 10:16:48 -08:00
Wayne Chen
3d99ffc459 outing oculus login 2018-12-05 08:25:01 -08:00
Wayne Chen
a30f4ed0b3 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-05 08:17:06 -08:00
Wayne Chen
4daa943510 fixing scripts param/reverting some qml 2018-12-04 17:17:58 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml 2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 17:01:56 -08:00
Wayne Chen
3951203b55 adding tablet bg/no movement in login state 2018-12-04 16:50:01 -08:00