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

62428 commits

This branch
This branch
All branches
Author SHA1 Message Date
luiscuenca
d70a3685b8 Clean up 2017-12-04 15:29:13 -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
Alexander Ivash
f7328f05fb remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface 2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation 
Call reset() on Wallet before creating new wallet
 2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button 2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8 10024 Wallet: TextField Focus Problems 
note: removed excessive MouseArea-s
 2017-12-05 00:03:48 +03:00
Nissim Hadar
29b2eaacde Merge branch 'master' of https://github.com/highfidelity/hifi 2017-12-04 13:53:44 -06:00
Dante Ruiz
a1bf54ff00 fix issue of no_bootstrapping not being set correctly 2017-12-04 11:16:41 -08:00
Zach Fox
5261434b6a Further remove dependencies of marketplaces.js on edit.js 2017-12-04 09:45:36 -08:00
Dante Ruiz
03934549cc Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children 2017-12-04 09:08:11 -08:00
Brad Hefta-Gaub
33adb0d76d
Merge pull request #11868 from ctrlaltdavid/21615 
Add "size" as synonym for "dimensions" in model overlay property setter
 2017-12-03 18:10:30 -08:00
Brad Hefta-Gaub
06cf194ec7
Merge pull request #11910 from ctrlaltdavid/21626 
Fix erroneous 2D overlay unhandled property messages for bounds property
 2017-12-03 18:09:17 -08:00
Alexander Ivash
d60f082796 9706 Editing Attachments Results In Attachments Window Scrolling To Top 2017-12-03 23:24:34 +03:00
luiscuenca
4030688e7a added record wav files 2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub
218b4635b2
Merge pull request #11904 from druiz17/fix-equipping 
Fix adjusting equipped entities
 2017-12-02 18:31:00 -08:00
Brad Hefta-Gaub
314265fa86
Merge pull request #11891 from ctrlaltdavid/21625 
Add missing line3d overlay property getters and setters
 2017-12-02 12:52:44 -08:00
Brad Hefta-Gaub
ce68b720c2
Merge pull request #11886 from druiz17/fix-vive-head-pose 
Register the Vive inputDevice if no controllers are available
 2017-12-02 12:52:31 -08:00
Brad Hefta-Gaub
3f705a7baf
Merge pull request #11858 from vladest/fix_tablet_scrollbars 
Use ScrollBars from QQC2, which supports mouse and touch events
 2017-12-02 12:51:14 -08:00
Brad Hefta-Gaub
ec33aa9c4b
Merge pull request #11880 from ElderOrb/FB7991 
7991 Change Instances of Edit Mode to Create Mode
 2017-12-02 12:50:48 -08:00
Brad Hefta-Gaub
b2c5154cb6
Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing 
fix issues in model import sizing caused by recent refactor
 2017-12-02 09:30:57 -08:00
Nissim Hadar
c35310c2fb Deal with user canceling folder selection. 2017-12-01 17:17:11 -08:00
Dante Ruiz
1e6b5c0c75 make requested changes 2017-12-01 17:09:00 -08:00
Anthony Thibault
fe16cc3fab
Merge pull request #11902 from luiscuenca/onloadFix 
Fixes create list and web and QML audio sync
 2017-12-01 16:05:07 -08:00
Dante Ruiz
a1d90b5dd9 added extra bit 2017-12-01 15:41:13 -08:00
Nissim Hadar
f9f731acc5 Merge branch 'master' into QtImageCompare 2017-12-01 15:27:34 -08:00
luiscuenca
fefedc11c8 mac fix 2017-12-01 15:17:23 -07:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh 
Don't refresh Inventory or Recent Activity if data hasn't changed
 2017-12-01 13:57:34 -08:00
luiscuenca
d271f61987 Proper fix 2017-12-01 14:37:59 -07:00
Nissim Hadar
6c2e701023 Improved CMakeLists.txt for QT deployment. 
Changed threshold from 0.999 to 0.9998
 2017-12-01 13:31:52 -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
Brad Hefta-Gaub
dd6af08084
Merge pull request #11908 from ZappoMan/fixModelImportSizing 
fix issues in model import sizing caused by recent refactor
 2017-12-01 12:28:14 -08:00
Nissim Hadar
a83244c27f Corrected typo in comment. 2017-12-01 11:16:57 -08:00
Zach Fox
3fb1df88cb
Merge pull request #11913 from zfox23/commerce_fixMonthLol_RC60 
Fix month display in commerce... RC60 PR
 2017-12-01 10:49:57 -08:00
Zach Fox
b8f7ba9aa6 Fix month display in commerce... 2017-12-01 10:45:36 -08:00
Zach Fox
52ca9a6c76
Merge pull request #11911 from zfox23/commerce_fixMonthLol 
Fix month display in commerce...
 2017-12-01 10:44:19 -08:00
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03:00
Zach Fox
ebb2e50d01 Fix month display in commerce... 2017-12-01 09:29:19 -08:00
Nissim Hadar
526aa8fe57 Changed threshold from 0.98 to 0.999 2017-12-01 09:28:31 -08:00
David Rowe
fd76c7a88b Fix erroneous 2D overlay unhandled property messages for bounds property 2017-12-01 17:40:34 +13:00
Nissim Hadar
12ac551d25 Changed power from 2.0 to 2 2017-11-30 18:27:47 -08:00
Nissim Hadar
c0673db3c5 Fix for MacOS 2017-11-30 18:23:58 -08:00
ZappoMan
d1017d81bd fix issues in model import sizing caused by recent refactor 2017-11-30 18:08:32 -08:00
ZappoMan
750d505f9b fix issues in model import sizing caused by recent refactor 2017-11-30 17:51:59 -08:00
Nissim Hadar
e1e0163992 Merge branch 'master' into QtImageCompare 2017-11-30 17:24:32 -08: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