Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 09:36:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72809 commits 76 branches 59 tags 1.2 GiB
Commit graph

4082 commits

Author SHA1 Message Date
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
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
Wayne Chen
3bd10716b2 wip 2018-10-19 16:06:28 -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
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
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
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
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
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
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1 
Fix some Mac rendering issues
 2018-10-01 16:35:57 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061 
use current wearable index, not joint index!
 2018-10-01 16:14:33 -07:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML 2018-10-01 09:48:42 -07:00
Dante Ruiz
ad92b172cb removing comment 2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0 merging from master 2018-10-01 09:44:54 -07:00
Zach Fox
59eabbbb5d Fix MS18608: Use new connections api endpoint 2018-09-28 14:28:50 -07:00
Zach Fox
5b72e17981 Fix MS18154: Don't snap to cards in My Purchases 2018-09-28 11:33:22 -07:00
Kerry Ivan Kurian
440e2062f5 Fix application uninstall in marketplace item tester 2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
868a3a9219 Tweak vertical spacing 2018-09-28 15:42:48 +12:00
Bradley Austin Davis
3dea4fd10a Fix some Mac rendering issues 2018-09-27 19:21:50 -07:00
David Rowe
4813f4d042 Show/hide jumping & flying checkbox depending on movement mode 2018-09-28 13:02:27 +12:00
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00