Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 09:25:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71206 commits 71 branches 56 tags 1.2 GiB
Commit graph

6385 commits

Author SHA1 Message Date
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
David Back
f382b76abc Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-06 09:57:24 -07:00
David Back
82ed57e41f triple list structure, added columns, sorting 2018-09-05 17:59:03 -07:00
David Back
40d4f581f5 working scrolling 2018-09-05 13:16:23 -07:00
unknown
f941026a62 new entity list view wip 2018-09-04 19:11:09 -07:00
Sam Gateau
969d16262f Removing cruft and warnings 2018-08-30 22:20:30 -07:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
Sam Gateau
6c502e79e3 Fine tuning a LOD regulator PV that works 2018-08-29 22:56:44 -07:00
Sam Gateau
4844f06e5e brain freeze 2018-08-29 17:33:39 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
Sam Gateau
ed4dbaa4c7 Refining the plot widget to be able to represent negative values 2018-08-29 16:07:30 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping 
Edit mode controller mapping using new platform state variables
 2018-08-29 16:06:47 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 
MS16847: Tablet button doesn't load in HMD mode
 2018-08-29 13:20:04 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
David Back
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
Sam Gateau
37b4cf6223 Picking pid values 2018-08-28 17:39:35 -07:00
Sam Gateau
0da22db837 Picking pid values 2018-08-28 16:05:57 -07:00
Sam Gateau
7dfdc79644 Picking pid values 2018-08-28 12:21:15 -07:00
Sam Gateau
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
Sam Gateau
8f8bcc1901 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-24 15:23:37 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Sam Gateau
699240027e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-23 19:29:14 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout 
Implement Wallet Security feature - Auto Logout checkbox
 2018-08-23 18:04:38 -07:00
Sam Gateau
57fd824005 working on the LOD behavior 2018-08-23 17:30:23 -07:00
Sam Gateau
cee9b90930 working on the LOD behavior 2018-08-23 16:48:42 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
e3d03cd321 Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review 2018-08-23 13:16:02 -07:00
Sam Gateau
473f8d0ca5 Working on the LOD system 2018-08-23 11:39:47 -07:00
John Conklin II
04d72ea39d
Merge pull request #13850 from samcake/punk 
Adjust Workload Region to be bigger
 2018-08-22 10:21:14 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Sam Gateau
0f6f465e7f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-21 19:23:33 -07:00
Wayne Chen
4e9a544618 redoing newline 2018-08-21 16:01:24 -07:00
Wayne Chen
bb176eb228 trailing debug statements 2018-08-21 16:00:01 -07:00
John Conklin II
1b4314ae45
Merge pull request #13846 from ctrlaltdavid/M17652-b 
Reduce strength of teleport parabola
 2018-08-21 11:32:40 -07:00
Wayne Chen
bfb9b67968 more debug statements 2018-08-21 11:17:33 -07:00
Sam Gateau
1914f1f103 Extending the default size of the regions to 16km 2018-08-21 10:10:39 -07:00
David Rowe
67eb03ba7d Reduce strength of teleport parabola 2018-08-21 11:18:00 +12:00
Sam Gateau
e60756cfe6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 15:54:23 -07:00
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615 
Disable Vive teleport button if transitioning from direction button
 2018-08-20 14:05:45 -07:00
Sam Gateau
adc8a39c87 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 09:32:42 -07:00