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

7863 commits

Author SHA1 Message Date
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes 
Bugz-504: more stable nametag updates
 2019-06-19 14:07:19 -07:00
RebeccaStankus
f5fa44dc21 Revert "Changed icons path to be relative" 
This reverts commit e277070423.
 2019-06-19 12:06:34 -07:00
RebeccaStankus
e277070423 Changed icons path to be relative 2019-06-19 11:17:52 -07:00
RebeccaStankus
30dd667b17 Changed qml import method 2019-06-19 10:40:32 -07:00
Milad Nazeri
61e4155eda cr-r1 2019-06-19 07:30:28 -07:00
Milad Nazeri
422c70f300 fixed cache and extra line 2019-06-18 14:35:00 -07:00
Milad Nazeri
6196c6b746 more stable nametag updates 2019-06-18 14:32:11 -07:00
RebeccaStankus
3b53e34c95 fixing paths 2019-06-18 11:35:00 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
RebeccaStankus
cd508a5475 Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles 2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22 moved files 2019-06-17 16:45:54 -07:00
Preston Bezos
1801dc9d90 gave previous status a default value 2019-06-17 15:18:16 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b getting rescaling to work for forward yop 2019-06-14 00:48:07 -07:00
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
RebeccaStankus
772bad58ca Increased bottom margin on muted overlay 2019-06-13 15:55:49 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut 
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
 2019-06-13 14:32:36 -07:00
Zach Fox
1a0002db0c BUGZ-676: Remove references to interstitial from SUI version of progress.js 2019-06-13 13:06:40 -07:00
Sam Gateau
b132a42e89 fixing the scroll view 2019-06-12 22:42:05 -07:00
Preston Bezos
e32d6e96ce code was backwards 2019-06-12 16:12:24 -07:00
Preston Bezos
2eeec3518d one last fix 2019-06-12 16:03:03 -07:00
Preston Bezos
3cd3f1a508 one last fix 2019-06-12 15:56:27 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Preston Bezos
8fa80f8935 fixed some formatting problems 2019-06-12 14:57:37 -07:00
Preston Bezos
038747e645 Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering 2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
5077ae1bd7
Merge pull request #15745 from PrestonB1123/hudRemnant 
BUGZ-355: Persistent UI Element
 2019-06-12 10:40:37 -07:00
Preston Bezos
6c0bbfae76 hopefully good now 2019-06-12 10:02:33 -07:00
Preston Bezos
266c08227f turned an else into an else if 2019-06-12 09:29:43 -07:00
Preston Bezos
a79a75702a reverted a couple of testing changes and added a variable 2019-06-12 09:17:18 -07:00
Preston Bezos
b32a715496 fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1 2019-06-11 16:29:32 -07:00
Brad Hefta-Gaub
0a9552226d
Merge pull request #15713 from sethalves/fix-create-baked-indicator 
case BUGZ-599: CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list
 2019-06-10 14:37:29 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut 
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
 2019-06-10 13:10:56 -07:00
amer cerkic
edc1018b2a simplified the check 2019-06-10 11:12:29 -07:00
amer cerkic
4cad49f561 adding undefined check on the toolbar object 2019-06-10 10:42:31 -07:00
Seth Alves
22d602a334 CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list 2019-06-07 16:36:29 -07:00
Sam Gateau
d406e52d71 Messing around 2019-06-06 16:37:49 -07:00
Sam Gateau
55ff39edaf Fixing an unecessary logging that was added during debug 2019-06-06 12:29:22 -07:00
Sam Gateau
34bae25d0e fixing the broken binding dependency for the propitems 2019-06-05 00:33:44 -07:00
Zach Fox
9150cd288f Add some logging instead of a scary popup 2019-06-04 13:36:00 -07:00
Zach Fox
19b2d35b87 Resolve DEV-99: Remove all menus from top bar 2019-06-04 13:25:03 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Zach Fox
25725bb91e Change 'your avatars' to 'your profile' 2019-05-31 11:46:13 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
a212a8a36a COnnect the profile tier to the performance setting and assign on first run or after reset... 2019-05-29 17:49:17 -07:00