Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 12:20:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 72 branches 59 tags 1.2 GiB
Commit graph

3737 commits

Author SHA1 Message Date
Zach Fox
5469025113 More more more 2018-01-09 15:53:25 -08:00
Nissim Hadar
bb04b68e42 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 15:51:46 -08:00
Nissim Hadar
0b1e321ccf Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 15:25:03 -08:00
Brad Hefta-Gaub
a7b56da570
Merge pull request #12103 from ZappoMan/emoteApp 
first cut at an emote app
 2018-01-09 15:23:14 -08:00
Zach Fox
530df5447d Even more proress 2018-01-09 15:19:50 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
Nissim Hadar
4ecb056210 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 13:44:13 -08:00
ZappoMan
4f1dc2f184 fix CR comments 2018-01-09 13:42:51 -08:00
Nissim Hadar
8042b4b3fb Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 13:28:14 -08:00
Zach Fox
0bc483f7a6
Merge pull request #12096 from ElderOrb/FB5648 
5648 play audio notification to confirm purchase upon rezzing
 2018-01-09 12:32:28 -08:00
Nissim Hadar
e94982a470 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 10:10:27 -08:00
Thijs Wenker
88d353a642
Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable 
Make zones, lights, and particles not grabbable when created in edit.js
 2018-01-09 18:26:13 +01:00
Seth Alves
72ac1dd216 walk by default, put old walk speed back 2018-01-09 08:50:20 -08:00
Alexander Ivash
7e87cb38e1 adjusted code to PR comments 2018-01-09 11:10:23 +03:00
ZappoMan
1fd9eae2b5 make second click stop animation if still playing, and shrink animation files 2018-01-08 17:57:12 -08:00
ZappoMan
0d1b34f487 make animation 60fps 2018-01-08 17:32:22 -08:00
Seth Alves
6626f55652 fix run script 2018-01-08 15:52:50 -08:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -08:00
Seth Alves
e0bbf9ee41 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072 make avatar walk-speed adjustable from js. add a tablet button to control walking vs running 2018-01-08 15:27:41 -08:00
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
Nissim Hadar
569cf1a30e Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-08 14:16:03 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch 
Touch feeling for near grab
 2018-01-08 12:50:30 -08:00
Liv Erickson
d1e176ee9d Update menu to reflect non-grabbable entity types, include particles 2018-01-08 11:31:09 -08:00
Dante Ruiz
fd83e00df4 fix tablet interaction and far grab functionallity 2018-01-08 11:30:21 -08:00
Alexander Ivash
9a63fc94f0 5648 play audio notification to confirm purchase upon rezzing 2018-01-08 21:14:44 +03:00
ZappoMan
1dc24072dc cleanup a few things in emote App 2018-01-08 09:04:07 -08:00
ZappoMan
c4d0872bbf first cut at an emote app 2018-01-07 22:28:50 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Nissim Hadar
f742ab7952 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-05 23:14:51 -08:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Liv Erickson
4e582975b6 cleanup 2018-01-05 18:03:20 -08:00
Liv Erickson
f563b8ca2e Make zones and lights not default grabbable 2018-01-05 17:49:43 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00
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
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
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
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
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