Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 07:09:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 25 branches 0 tags 1.1 GiB
Commit graph

5027 commits

Author SHA1 Message Date
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
luiscuenca
d0bc881bb2 Load script manually 2018-01-05 12:20:41 -07:00
Melissa Brown
933720fb10
Merge pull request #12012 from Delanir/Case10633 
Cases 10632 and 10633 Particle Explorer UI
 2018-01-05 10:46:41 -08:00
luiscuenca
108748ca96 smooth transitions and slower back to default 2018-01-05 09:55:50 -07:00
David Rowe
69dff9ac09 Remove unused code 2018-01-05 16:16:55 +13:00
David Rowe
4b2ed44322 Reduce incidence of tablet screen being rotated w.r.t. model 2018-01-05 16:16:42 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
David Rowe
67eb282815 Don't swap hands if both triggers are squeezed 2018-01-05 12:12:36 +13:00
David Rowe
27bed8d1f1 Tidying 2018-01-05 11:05:49 +13:00
David Rowe
fb09a9724e Change laser hand with trigger squeeze 2018-01-05 11:04:09 +13:00
David Rowe
9f7a2b18e6 Use laser from dominant hand if both hands are pointing at the tablet 2018-01-05 10:04:39 +13:00
David Rowe
02f4085368 Fix magic number 2018-01-05 09:00:53 +13:00
luiscuenca
367e2266f7 Fix eslint 2018-01-04 12:04:52 -07:00
luiscuenca
ef0164c272 Fix tabs 2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0 Fix default hand poses 2018-01-04 11:37:37 -07:00
David Rowe
6095a90e69 Don't display default lasers when Shapes app is active 2018-01-04 21:09:38 +13:00
David Rowe
6c16fcfe65 Fix tablet laser when Shapes app is running 2018-01-04 16:37:20 +13:00
David Rowe
7236ac17e2 Merge branch 'master' into 21661 2018-01-04 15:21:00 +13:00
David Rowe
efa6f1f02f Use "Prefer Stylus Over Laser" setting 2018-01-04 15:00:17 +13:00
Zach Fox
ff4f582c7d Thanks Howard 2018-01-03 17:23:35 -08:00
Zach Fox
8d4a6f01cb Fix bugs related to inspecting entities with hand controllers 2018-01-03 16:03:37 -08:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -08:00
nissim.hadar
b6bbf1abe1 Added sun intensity modulation as a function of altitude. 2017-12-29 23:47:42 -08:00
Nissim Hadar
7260b4ff7b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/entities/src/EntityPropertyFlags.h
 2017-12-29 15:16:14 -08:00
Nissim Hadar
87e896ab20 Zone inheritance ready for testing. 2017-12-29 15:13:46 -08:00
luiscuenca
47dbb0c168 load script manually 2017-12-29 15:35:44 -07:00
luiscuenca
49bd62ca29 Touch feeling for near grab 2017-12-29 14:04:36 -07:00
Nissim Hadar
0e76d481a1 Completed the use of radio-buttons to hide disabled sections. 2017-12-29 08:28:31 -08:00
Nissim Hadar
a6f3401d0e Removed background combo. 2017-12-29 08:15:34 -08:00
Nissim Hadar
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
8bb4d1431c WIP - copy skylight URL to ambient URL. 2017-12-28 09:35:40 -08:00
Nissim Hadar
9b9295aaec Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight. 2017-12-27 14:17:05 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
Nissim Hadar
3f82e9147b Change keylight/ambient mode default from "enabled" to "inherit" 2017-12-22 16:30:19 -08:00
Nissim Hadar
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-12-22 15:41:59 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
Nissim Hadar
2eb74647f0 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2017-12-22 08:05:46 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -08:00
luiscuenca
38bfddf786 Added filter for QT autogenerated functions and integrated it to Developers menu 2017-12-21 16:26:06 -07:00
luiscuenca
d93828f2f0 Fix an improve currentAPI.js 2017-12-21 11:50:02 -07:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
Nissim Hadar
4e59fecae2 Added keylight and ambient light mode radio-buttons to the html (the UI). 2017-12-20 10:24:51 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel 
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
 2017-12-20 09:18:10 -08:00
Zach Fox
297a3df63c
Merge pull request #11815 from zfox23/commerce_QmlWhitelist 
QML Whitelisting + Commerce Integration
 2017-12-19 18:07:14 -08:00
Zach Fox
a72ed27a25 CR feedback 2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
Zach Fox
ed5da4f83b Fix bug preventing 'get' buttons from working in marketplace 2017-12-19 15:07:50 -08:00
Zach Fox
18d5be147c Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-19 09:48:15 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut 
Handle sold out items a bit better
 2017-12-19 07:43:57 -07:00
Brad Davis
2fcf11455b Fixing edit state detection 2017-12-18 14:03:13 -08:00
Daniela Fontes
b392bafc5a Merge Case 10632 and 10633. 2017-12-18 21:12:18 +00:00
Daniela Fontes
9381d21767 Merge branch 'Case10632' into Case10633 2017-12-18 21:08:30 +00:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Artur Gomes
80898d9336 Fix sections styling for Particle Explorer tab. 2017-12-18 18:36:32 +00:00
Daniela Fontes
fcdb9b6cbe Particle Emitter 'Show Properties' button now changes to 'Hide Properties' when properties are already visible 2017-12-18 15:21:23 +00:00
David Rowe
5e19410293 Fix handshake satyhing on when release "x" if Ctrl or similar pressed 2017-12-17 15:23:40 +13:00
Brad Hefta-Gaub
95bfacb850
Merge pull request #11977 from ctrlaltdavid/21643 
Enable user connection with "x" key when capslock is on
 2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub
6aebfd61c5
Merge pull request #11999 from luiscuenca/laserScaleFix 
Make lasers scale with avatar
 2017-12-15 15:21:01 -08:00
luiscuenca
53e1c57e3b Make lasers scale with avatar 2017-12-15 13:46:15 -07:00
Zach Fox
94bd8d8673
Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons 
Fix broken Buy buttons on main Marketplace page
 2017-12-14 12:48:09 -08:00
Zach Fox
74a5f0881f Fix broken Buy buttons on Marketplace 2017-12-14 11:56:36 -08:00
David Kelly
a49ee46f54 Handle sold out items a bit better 2017-12-14 11:52:56 -07:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
David Rowe
627ce8ab87 Enable user connection with "x" key when capslock is on 2017-12-14 08:52:21 +13:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
Brad Hefta-Gaub
9bbe696a87
Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing 
possible fix for tablet freezing
 2017-12-13 08:59:17 -08:00
Seth Alves
3a00d31c15 oops 2017-12-12 12:59:35 -08:00
Seth Alves
dba05ae8e2 try harder to keep setTimeout loop going in controller-dispatcher 2017-12-12 12:38:01 -08:00
David Rowe
25214aad23 Code review 2017-12-13 08:56:36 +13:00
David Rowe
380cd7aac6 Tune particle effects to be similar to before 2017-12-12 17:35:37 +13:00
David Rowe
4327906630 Reduce communications load when making a user connection 2017-12-12 16:39:49 +13:00
Seth Alves
2cd64ccd2c merge from upstream 2017-12-11 10:14:30 -08:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-11 08:48:48 +01:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-10 09:53:22 -08:00
Zach Fox
b5899f7a00
Merge pull request #11957 from zfox23/commerce_fixEditDependencies 
Further remove dependencies of marketplaces.js on edit.js
 2017-12-08 16:48:37 -08:00
Dante Ruiz
f4a9acab92
Merge pull request #11833 from druiz17/controllerDispatcher-interval 
change controllerDispatcher to setTimeOut update
 2017-12-08 16:36:46 -08:00
Zach Fox
a99072622a Fix Create mode :| 2017-12-08 15:41:47 -08:00
Zach Fox
be737af79d Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies 2017-12-08 14:08:35 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Seth Alves
edd6c0ee76 Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3 2017-12-08 07:19:45 -08:00
Seth Alves
d095d4ef44 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-08 07:19:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling 
Fix for hand controller avatar scaling.
 2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope 
Improve Audio Scope
 2017-12-08 07:15:28 -08:00
Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos 
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
 2017-12-08 07:09:09 -08:00
Seth Alves
dfbd6bcd8d
Merge pull request #11933 from druiz17/fix-far-to-equip 
fix far grab to equip transition
 2017-12-08 07:04:54 -08:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108 
10108 marketplace category cannot scroll
 2017-12-08 07:02:15 -08:00
Sam Gateau
013d2e808d Adding the hovering from the mouse from the debugHighlight.js 2017-12-08 03:53:56 -08:00
Seth Alves
4659d22021 work around a crash when closing CREATE 2017-12-07 21:32:18 -08:00
Seth Alves
c4b2422f53 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 19:40:52 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
MandatoryMania
f1808ee126
Merge pull request #11943 from MandatoryMania/returnToMarketplace 
return to main mktplace page from rez page
 2017-12-07 19:14:37 -08:00
samcake
4c1dea2b30 Remove uneeded files 2017-12-07 17:54:14 -08:00
samcake
ace8e153c2 making sure the ID of an object in the Selection list is unique and more refined debugging 2017-12-07 17:45:40 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Seth Alves
40412b80c6 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 17:03:04 -08:00
Dante Ruiz
0286f4646a Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-12-07 16:19:03 -08:00
samcake
298b9be0c2 Reinstall highlight debug tool 2017-12-07 16:13:32 -08:00
samcake
65f22f498a remove previous version of debug highlight 2017-12-07 16:09:06 -08:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash 
Cleanup Web3DOverlay and tablet home button
 2017-12-07 14:06:56 -08:00
Dante Ruiz
4110295677 Merge branch 'master' of github.com:highfidelity/hifi into fix-far-to-equip 2017-12-07 13:42:26 -08:00
H Q
72ed3b077d Addressed PR change requests 2017-12-07 11:28:40 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633 
Fix image overlay's subImage property's width and height support
 2017-12-07 09:19:43 -08:00
Brad Hefta-Gaub
b91909011a
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049 
[Case 7049]: Remove unused fields and checkboxes from Edit.js
 2017-12-07 09:18:26 -08:00
Seth Alves
86f58c1353 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 08:50:50 -08:00
samcake
5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 08:48:12 -08:00
samcake
5500a6d11c More to come 2017-12-06 18:02:30 -08:00
H Q
ed76ca8018 return to main mktplace page from rez page 2017-12-06 15:37:19 -08:00
David Rowe
d61f0584c3 Fix diectory.js script's icon URL 2017-12-07 12:26:29 +13:00
Dante Ruiz
32fca16c85 fix radius equiping 2017-12-06 14:16:32 -08:00
Zach Fox
5f3b148baa Fix marketplace icon incorrectly appearing active 2017-12-06 13:01:23 -08:00
samcake
1efddb8260 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-06 10:21:45 -08:00
Seth Alves
2dd223ebaa Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-06 09:18:40 -08:00
samcake
1483195285 almost complete setup working, yeah 2017-12-05 18:27:53 -08:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08:00
Alexander Ivash
c007c6d00f 10108 marketplace category cannot scroll 2017-12-06 02:47:19 +03:00
Zach Fox
c807fc80e3 Add marketplace cta referrer 2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Dante Ruiz
bbc022da2d fix-far-to-equip 2017-12-05 14:09:46 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable 
stable -> master
 2017-12-05 11:58:23 -08:00
Seth Alves
3642d6cfdf fix includes 2017-12-05 11:26:36 -08:00
Seth Alves
c4e5c53eee jshint cleanups 2017-12-05 11:17:31 -08:00
Seth Alves
5b908dbf51 import zach's edit.js dependency fixes 2017-12-05 11:14:59 -08:00
Seth Alves
26cb275b89 adjust wearables with saved offsets after WEAR IT 2017-12-05 11:11:56 -08:00
Sam Gateau
1c5548b77b Color picker in qml 2017-12-05 01:25:30 -08:00
Olivier Prat
0b6dcb2717 Merge branch 'master' of git://github.com/highfidelity/hifi into csm 2017-12-05 09:18:26 +01:00
Sam Gateau
987246afb8 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-04 19:11:42 -08:00
samcake
de410b6833 I need a color editor 2017-12-04 17:29:01 -08:00
luiscuenca
390c59b45c Change menu and minor fixes 2017-12-04 15:29:01 -08:00
LaShonda Hopper
eb8438a9e8 [Case 7049] Addresses code review feedback. 
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-12-04 18:25:51 -05:00
NissimHadar
ec1c4c37fa
Merge pull request #11912 from ElderOrb/FB9461 
9461 Keyboard for create appear then disappears immediately (HMD)
 2017-12-04 16:49:25 -06:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Zach Fox
5261434b6a Further remove dependencies of marketplaces.js on edit.js 2017-12-04 09:45:36 -08:00
LaShonda Hopper
2cc9a8b2b2 [Case 7049] Give collision section a header for consistency. 
Changes Committed:
    modified:   scripts/system/html/entityProperties.html
 2017-12-01 16:00:27 -05:00
LaShonda Hopper
82dd13a82c [Case 7049] Fixes superfluous fields issue with Particle Effects (details below). 
When creating or selecting an object entityProperties.html's properties-list is
updated to have and entity type specific class.  This class is used within
edit-style.css to specify rules for the Properties Tab when a certain type of
entity is currently selected.

This resolves the issue with duplicate/misleading color fields for Particle
Effects by adding .ParticleEffectMenu rules to edit-style.css to control the
visible sections.

When the Properties Tab is in the ParticleEffectMenu mode only the following
sections are shown (listed as ordered):
    General Section
    Collision Section
    Physical Section
    Spatial Section
    Behavior Section

Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
    modified:   scripts/system/html/js/entityProperties.js
 2017-12-01 15:59:52 -05:00
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03:00
LaShonda Hopper
6469dbddc1 [Case 7049] ESLint: Fixes unknown/undefined symbol errors (details below). 
* Fixes the following:
    * 1775:5  error  'augmentSpinButtons' is not defined    no-undef
    * 1777:5  error  'setUpKeyboardControl' is not defined  no-undef

ESLint Issue Count is now 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:43:40 -05:00
LaShonda Hopper
991143655f [Case 7049] ESLint: Fixes indent and max-len errors. 
Issues dropped from 26 to 2.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:41:20 -05:00