Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-17 10:09:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63915 commits 26 branches 28 tags 1.2 GiB
Commit graph

23570 commits

Author SHA1 Message Date
LaShonda Hopper
70e23f3ce8 [Case 10865] Bringing in multi-select fix from Desktop AssetServer. 
Changes Committed:
    modified:   interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
 2018-01-30 14:44:34 -05:00
LaShonda Hopper
dfdf28f37e [Case 10865] Some cleanup for multi-selection (details below). 
* Remove setCurrentIndex call when looping over current selection.
* Changed selectedItems var name to selectedItemCount to clarify what
  it represents.
* Change path arg name to paths to clarify that there can be more
  than a single path contained within it.

Changes Committed:
    modified:   interface/resources/qml/hifi/AssetServer.qml
 2018-01-30 14:44:34 -05:00
LaShonda Hopper
5a771e3a16 [Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for Asset Browser. 
* Removes manual selectionModel update from controls-uit/Tree.qml
    * This was interfering with the Key+Click functionality.  It
      was introduced via Commit 99617600c4 to address a selection
      issue; however, it's unclear what that issue was.  Selection
      within the Asset Browser works without it at present.
* Amends the ContextMenu within the AssetBrowser to work in conjunction
  with the multi-selection changes.
    * ContextMenu will _only_ display when triggered within the current
      selection be it one or more items as opposed to previous behavior
      of selecting the item the menu was triggered on.
    * CopyURL is only enabled when the selection size is 1
    * Rename is only enabled when the selection size is 1
    * Delete is enabled when the selection size is greater than 0

Changes Committed:
    modified:   interface/resources/qml/controls-uit/Tree.qml
    modified:   interface/resources/qml/hifi/AssetServer.qml
 2018-01-30 14:44:34 -05:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark 
Bookmark avatar entities
 2018-01-29 12:55:35 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Dante Ruiz
a637bac2fe remove debug statement 2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-29 11:25:26 -08:00
humbletim
e2afcac534 include .extraInfo as part of RayPick API constructors 2018-01-26 18:34:13 -05:00
Seth Alves
3be42fe79a Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan 2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182 add breaks in case statements that used to have returns 2018-01-26 10:36:16 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
Zach Fox
f117dd33a8 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain 2018-01-25 15:04:28 -08:00
Brad Davis
ab4e2d99f1 Don't try to set the current directory to a QRC path 2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51 Fix help screen URL 2018-01-25 13:04:08 -08:00
Brad Davis
d4aef1ea88 Fix URLs in QSS files to use QRC base path 2018-01-25 13:03:42 -08:00
Brad Davis
ac94327ec7 Fix loading of the context overlay information icon 2018-01-25 12:44:55 -08:00
Zach Fox
afc71a5ac5 Fix Purchases sorting (again); Fix (i) icon loading 2018-01-25 12:17:34 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear 
Fix security image index clear after back nav
 2018-01-24 13:43:49 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp 
Fix Interface first launch should show help
 2018-01-24 12:11:34 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter 
Fix the text filter in My Purchases
 2018-01-24 08:42:55 -08:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
Brad Davis
288e753eea Fix font loading from non-QRC html 2018-01-22 16:48:00 -08:00
luiscuenca
6d6950deca Fix Interface first launch should show help 2018-01-22 16:25:58 -07:00
Brad Davis
6a91d549ce Fix stylus overlay 2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703 
Revert "Display both lasers on tablet and Web surfaces"
 2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master 
Fix lockup when no midi devices present.
 2018-01-22 11:25:46 -08:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI 
Updated UI to fit Toolkit Standards
 2018-01-22 10:30:48 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2 
Commerce: Pixel-perfect "Send Money" UI
 2018-01-22 09:39:23 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295 de-bounce Midi::USBchanged signal. 
Debounced USBchanged signal to prevent pauses.
 2018-01-20 11:17:47 -08:00
ZappoMan
ab9041bcab remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts 2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00
Zach Fox
89e403d438 Balance text in send money 2018-01-19 15:39:57 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
RebeccaStankus
5db5f24043 Updated UI to fit Toolkit Standards 2018-01-19 14:52:44 -08:00
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00