Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 06:47:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68497 commits 76 branches 59 tags 1.2 GiB
Commit graph

4795 commits

Author SHA1 Message Date
Dante Ruiz
6685fbbfc4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 13:56:54 -07:00
Stephen Birarda
10e34000aa
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains 
Domain-unreachable message remaining on slow connects
 2018-06-11 10:46:55 -07:00
Dante Ruiz
ba86c9753d Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 09:13:14 -07:00
howard-stearns
020d622302 don't depend on matching handlers with overlapping requests 2018-06-09 17:34:49 -07:00
howard-stearns
421edbfa1e PSFListModel isa ListModel instead of hasa 2018-06-09 16:03:45 -07:00
howard-stearns
d68415c47c code feedback 2018-06-08 16:47:06 -07:00
howard-stearns
f0d486a6a5 remove the unused client-side stuff from model 2018-06-08 15:48:39 -07:00
howard-stearns
d9daa3495a remove comments / dead code 2018-06-08 15:36:10 -07:00
howard-stearns
36a0adf553 strip snapshot stacking code - we'll do it on server or not at all 2018-06-08 14:24:24 -07:00
Dante Ruiz
5843c24309 adding perfectly straight model and adjusting ovelray 2018-06-08 13:56:00 -07:00
howard-stearns
3ade31bdf6 always show edition 2018-06-08 12:57:40 -07:00
howard-stearns
dd0f3c64ec Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-08 12:12:21 -07:00
Zach Fox
9f0864944c Fix Friending in Connections tab - READ FIXME 2018-06-08 11:37:02 -07:00
David Back
e8aece4c11
Merge pull request #13315 from dback2/avatarFeet 
Fix default avatar feet
 2018-06-08 10:00:43 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
howard-stearns
595a0d8733 restore lost code 2018-06-07 19:24:05 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
Zach Fox
f9b6e3e2ac
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks 
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
 2018-06-07 15:10:00 -07:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
David Back
ae5d056ca0
Merge pull request #13292 from dback2/fileChooser 
File Dialog Fixes
 2018-06-07 09:38:56 -07:00
David Back
a246c9f0d1 fix fbx and textures 2018-06-06 15:47:29 -07:00
howard-stearns
8185d1b5f5 cleanup and consistently don't getNextPage at beginning 2018-06-06 15:24:54 -07:00
Dante Ruiz
d57d087752 update tablet model again 2018-06-06 12:48:20 -07:00
David Back
c294dd4ac7 fix path and name 2018-06-06 12:32:47 -07:00
David Back
afd4b5a8ab update default avatar to fix non-flat feet 2018-06-06 11:48:04 -07:00
Dante Ruiz
25305ab57f updating texture 2018-06-06 11:31:39 -07:00
Dante Ruiz
995cfeb3c5 cleaning code 2018-06-06 10:42:12 -07:00
Dante Ruiz
59c50b7f26 remove highlight overlay in favor of materialEntity 2018-06-06 08:38:58 -07:00
howard-stearns
335aeaeb38 purchases cleanup, wearables, and edition numbers when multiples seen. 2018-06-05 17:06:08 -07:00
howard-stearns
6aa551b35c Don't getNextPage when at beginning (even if that is also the end). 2018-06-05 17:04:29 -07:00
Dante Ruiz
b275bbe5a7 saving changes 2018-06-05 15:44:17 -07:00
howard-stearns
ce41b83bad Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-05 15:30:04 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
howard-stearns
f72f8c762b goto client-side filtering (preliminary) 2018-06-04 16:52:20 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00
David Back
6b7d9586d1 apply fixes to other file dialogs and fix tablet dialog buttons 2018-06-04 15:56:10 -07:00
howard-stearns
5a1b56d573 checkpoint with goto feeds working (but without filtering) 2018-06-04 13:11:06 -07:00
howard-stearns
e40fc20cb6 fix some bugs that had been introduced by various out-of-team prs. 2018-06-04 13:00:08 -07:00
David Back
074892591d fix auto-selecting subdir and not showing Choose when no row selected 2018-06-04 11:13:03 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00