Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 20:46:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72799 commits 25 branches 0 tags 1.1 GiB
Commit graph

5214 commits

Author SHA1 Message Date
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting 
Add a 'grabbable' option to the new-model dialog
 2018-10-22 11:42:40 -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
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs 
Fix MS18609: Various Snapshot sharing bugs
 2018-10-18 18:21:23 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
John Conklin II
addae51976
Merge pull request #14215 from ctrlaltdavid/M19308 
Hide mini tablet immediately upon near grabbing an entity
 2018-10-18 17:47:17 -07:00
David Back
45a92fd537 style tweaks 2018-10-18 15:12:38 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00
Wayne Chen
6cf9608c97 adding fade in and fade outt in interstitial for progress 2018-10-18 13:12:04 -07:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
Seth Alves
7f150e6ed3 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-18 09:53:18 -07:00
Zach Fox
72b3777953 Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs 2018-10-18 09:39:34 -07:00
David Back
f13008dbe9 tabs 2018-10-17 20:04:28 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
David Back
ad920ddc86 fix double min, unique collides subproperty ids 2018-10-17 19:44:38 -07:00
Thijs Wenker
b9cfa28c08 style fixes 2018-10-17 19:42:47 -07:00
Thijs Wenker
684f7d5689 move export selection button to bottom of the list 2018-10-17 19:37:56 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection 
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
 2018-10-17 19:50:37 +02:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
David Rowe
c9919ff69d Hide mini tablet immediately upon near grabbing an entity 2018-10-16 08:22:30 +13:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
Seth Alves
47d3c9ba27 go to error-room when failing to connect to a full domain 2018-10-12 11:28:54 -07:00
David Back
62c5fb8e2e tweaks / dropdown fix 2018-10-11 14:25:06 -07:00
David Back
3f08400741 comment 2018-10-11 12:48:08 -07:00
David Back
5528050898 CR changes - propertyName vs propertyID, store name/elementID, return property element 2018-10-11 12:44:07 -07:00
David Back
ac0e999629 fix colors 2018-10-10 17:31:06 -07:00
David Back
31e665ab8b CR changes - runtime property data rework 2018-10-10 16:49:20 -07:00
David Back
60d102c9bf styling fixes 2018-10-09 12:42:57 -07:00
David Back
7aba0a9082 cleanup 2018-10-09 10:17:39 -07:00
David Back
27d9e8bd23 initial pass refactored re-ordered data-driver entity properties 2018-10-09 10:11:30 -07:00
David Rowe
0b163ffaf8 Fix typos 2018-10-09 11:05:48 +13:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
Wayne Chen
89e2cf7153
Merge pull request #7 from danteruiz/interstitialMerged 
Interstitial merged
 2018-10-04 17:10:27 -07:00
Wayne Chen
a2237aa48a reverting click overlay behavior 2018-10-04 16:41:14 -07:00
Wayne Chen
c423305bd1 check overlay visibility before showing back up again 2018-10-04 16:30:48 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
Wayne Chen
2e3566bc73 hide overlays after clicking on them 2018-10-04 14:24:43 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00