Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 16:02:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71368 commits 71 branches 56 tags 1.2 GiB
Commit graph

6418 commits

Author SHA1 Message Date
David Back
7eb05a3cc8 merge changes, fix various issues 2018-09-11 16:34:21 -07:00
David Back
50fed873d1 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 09:52:25 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs 
Improvements to entity list loading times
 2018-09-11 09:33:28 -07:00
John Conklin II
b184ad1334
Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955 
MS13955: Audio Stats are blank
 2018-09-10 17:03:31 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash 
MS18269: Fix Reloading Scripts with Create open crashes system
 2018-09-10 15:01:43 -07:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities 
MS17841: CreateApp - Adjust default position of new entities
 2018-09-10 14:45:56 -07:00
Roxanne Skelly
c7b07c8f27
Merge pull request #13946 from roxanneskelly/featuredStories 
For stories, use the action string for notifications instead of a hard-coded value.
 2018-09-10 14:25:03 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
0fadfd2f4c Remove list.js in entityList.html 2018-09-10 12:14:07 -07:00
Thijs Wenker
2000954ad2 Temporary fix for reload crash MS18269 2018-09-10 20:13:06 +02:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
John Conklin II
e578b047b0
Merge pull request #13838 from danteruiz/fix-hmd-debug-window 
fixing scripting window visiblity and size issues
 2018-09-07 11:47:44 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
David Back
b82f6d0bad lines/spacing 2018-09-06 16:54:58 -07:00
David Back
14a3eb4c97 lines/spacing 2018-09-06 16:52:58 -07:00
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
Roxanne Skelly
8a20969103 Fix typo 2018-09-06 10:38:10 -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
Roxanne Skelly
4fa7ac1af2 Merge branch 'master' of https://github.com/highfidelity/hifi into featuredStories 2018-09-05 16:51:25 -07:00
Roxanne Skelly
bb8d9c5cf0 For stories, base the notification popups off of the action_string instead of a hard-coded value. 2018-09-05 16:50:08 -07:00
Ryan Huffman
335f66d165 Add filtering support to entity list 2018-09-05 14:30:48 -07:00
Ryan Huffman
739530cb85 Limit Entity List to only getting the properties it needs 2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485 Update entity list UI to be updated in a single batch 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a Move entity list qml to scripts dir 2018-09-05 14:30:19 -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
Wayne Chen
796a18a48a Merge branch 'master' of https://github.com/highfidelity/hifi into fixAudioStats-RC71-13955 2018-08-29 16:13:54 -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