Zach Fox
|
7a88c8362b
|
naming CR feedback
|
2019-05-22 15:01:22 -07:00 |
|
Zach Fox
|
3a4bf2e8f7
|
Fix the janky audio output settings UI
|
2019-05-22 14:27:06 -07:00 |
|
Zach Fox
|
6f7557b00d
|
Implement BUGZ-305 and BUGZ-306
|
2019-05-22 09:56:28 -07:00 |
|
Zach Fox
|
5749392e83
|
New bg color; Final status indicator design; Fixed HMD icon
|
2019-05-21 14:10:27 -07:00 |
|
Zach Fox
|
15bdb66943
|
Integrate Status into top bar; improve Audio settings; improve spacing between settings
|
2019-05-17 17:25:48 -07:00 |
|
Brad Hefta-Gaub
|
4e86948c25
|
Merge pull request #15580 from MiladNazeri/simplifiedUINametag
changed size of always on overlays to be smaller
|
2019-05-17 14:42:29 -07:00 |
|
Zach Fox
|
e40e34856b
|
Remove some extra menus from top bar; Only show VR button if headset connected
|
2019-05-17 13:28:59 -07:00 |
|
milad
|
0d80761cf0
|
added larger distance for on
|
2019-05-17 13:23:03 -07:00 |
|
milad
|
06056b9531
|
updated location in main UI
|
2019-05-17 13:00:26 -07:00 |
|
milad
|
935d152617
|
forgot to copy a folder in to the local repo
|
2019-05-17 12:42:10 -07:00 |
|
milad
|
df098cab2f
|
changed size of always on overlays to be smaller
|
2019-05-17 12:36:03 -07:00 |
|
Zach Fox
|
90a5b25600
|
A bunch of changes here
|
2019-05-16 14:18:04 -07:00 |
|
Zach Fox
|
966965af5b
|
Merge pull request #15538 from zfox23/simplifiedUI
Simplified UI v1
|
2019-05-14 17:45:30 -07:00 |
|
Brad Hefta-Gaub
|
7440ef3cf3
|
Merge pull request #15506 from SaracenOne/unify_primitives
Case 19510: Unify cube and sphere edit menu entries into one.
|
2019-05-14 15:31:06 -07:00 |
|
Zach Fox
|
f9b51df296
|
Reduce size of output muted overlay; restore scroll to 0 on settings tab switch
|
2019-05-14 15:05:26 -07:00 |
|
Zach Fox
|
c57ddf969a
|
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
|
2019-05-14 09:32:07 -07:00 |
|
Zach Fox
|
89006cd9c5
|
Hide controls in top left; don't remove certain menus; fixup slider UIT
|
2019-05-13 17:26:19 -07:00 |
|
Shannon Romano
|
32d3014d0d
|
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
case 22190: Disable triggering away state when interface focus lost
|
2019-05-13 13:22:28 -07:00 |
|
Shannon Romano
|
b1060bcb83
|
Merge pull request #15508 from dback2/materialTargetTooltip
Case 22467: Fix material target tooltip
|
2019-05-13 13:08:28 -07:00 |
|
milad
|
51cbadcad1
|
Removed Selection related logic
|
2019-05-10 14:41:55 -07:00 |
|
Zach Fox
|
112e13383b
|
Dock it!
|
2019-05-10 12:03:29 -07:00 |
|
Zach Fox
|
314c04ab96
|
Simplified UI v1
|
2019-05-10 10:49:25 -07:00 |
|
SamGondelman
|
2bb522eea6
|
entity icons ignorePickIntersection when not visible
|
2019-05-09 14:16:59 -07:00 |
|
Saracen
|
b730c457ca
|
Replace tabs with spaces
|
2019-05-09 18:08:36 +01:00 |
|
Saracen
|
fd3c69a905
|
Replace tabs with spaces.
|
2019-05-09 02:14:00 +01:00 |
|
Shannon Romano
|
4c31c6f6e5
|
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
Avatar verification
|
2019-05-06 08:04:06 -07:00 |
|
unknown
|
0da318f2cd
|
fix material target tooltip
|
2019-05-03 10:37:35 -07:00 |
|
Saracen
|
43ddf7ca23
|
Unify cube and sphere edit menu entries into one.
|
2019-05-02 22:40:11 +01:00 |
|
Angus Antley
|
c0da46453b
|
made correction
|
2019-04-30 14:34:10 -07:00 |
|
Angus Antley
|
5c6ea082db
|
changed away script to make you active if you turn on your mic
|
2019-04-30 14:06:18 -07:00 |
|
Simon Walton
|
ae68478aea
|
Remove avatarTheftPrototype.js
|
2019-04-27 23:42:28 -07:00 |
|
Simon Walton
|
1fe8f4332f
|
Fixes to banner; swap out avatar on client; reviewer comments; other WIP
|
2019-04-26 18:45:48 -07:00 |
|
Simon Walton
|
f3efee56c0
|
Merge remote-tracking branch 'upstream/master' into avatar-verification
|
2019-04-25 13:40:27 -07:00 |
|
Simon Walton
|
de97af5c02
|
Minimal working version for avatar's client
Also merge of Wayne's proof-of-concept
|
2019-04-24 17:42:51 -07:00 |
|
Sam Gondelman
|
1540c5d203
|
Merge pull request #15401 from SamGondelman/grid
Case 22229: Create Grid ignorePickIntersection
|
2019-04-24 12:24:27 -07:00 |
|
Shannon Romano
|
42fb23ed5d
|
Merge pull request #15435 from samcake/blackProp
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
|
2019-04-24 09:22:11 -07:00 |
|
Shannon Romano
|
a6ff19c4ee
|
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
|
2019-04-24 09:13:59 -07:00 |
|
unknown
|
22c2bfc075
|
fix material target parentIDChanged
|
2019-04-22 15:03:12 -07:00 |
|
Sam Gateau
|
6539482cc2
|
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
|
2019-04-22 08:46:34 -07:00 |
|
Sam Gateau
|
ba02aa7098
|
making luci2 better
|
2019-04-19 16:56:55 -07:00 |
|
Sam Gateau
|
af3d981ad1
|
Bringing the Luci interface into the new Prop framework and moving some tools there too
|
2019-04-18 17:44:08 -07:00 |
|
Thijs Wenker
|
386d392144
|
The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = >
|
2019-04-18 19:05:40 +02:00 |
|
Sam Gateau
|
3d78592bb8
|
Adding more style widgets andbringing luci1 into the panels of luci2
|
2019-04-18 00:19:19 -07:00 |
|
Sam Gateau
|
9873c10353
|
Better canvas ICon qml and activation of the jobs
|
2019-04-17 17:58:48 -07:00 |
|
Thijs Wenker
|
dc9f8895f8
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties
# Conflicts:
# scripts/system/html/js/entityProperties.js
|
2019-04-18 00:21:11 +02:00 |
|
SamGondelman
|
54d7bde91a
|
grid ignorePickIntersection
|
2019-04-17 10:56:55 -07:00 |
|
Sam Gateau
|
92c1fd69c1
|
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
|
2019-04-17 10:09:20 -07:00 |
|
Sam Gateau
|
4ce7d75720
|
FInding a path
|
2019-04-16 23:38:40 -07:00 |
|
Sam Gateau
|
f6001c178d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
|
2019-04-16 18:43:30 -07:00 |
|
Sam Gateau
|
f2b747a68d
|
Adding indentation of the folder in the header and refining background color
|
2019-04-16 18:15:00 -07:00 |
|
unknown
|
2839879657
|
Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix
|
2019-04-16 15:26:47 -07:00 |
|
Shannon Romano
|
ec22f7847e
|
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster
Case 22130: PR 15366 changes from v82 to Master
|
2019-04-16 15:17:08 -07:00 |
|
Sam Gateau
|
1fd88e8269
|
Merge branch 'master' of github.com:highfidelity/hifi into blackProp
|
2019-04-15 14:05:33 -07:00 |
|
Thijs Wenker
|
ef7c34eadd
|
addressed more CR feedback
|
2019-04-15 19:04:24 +02:00 |
|
Sam Gateau
|
e7e9715e10
|
merging up
|
2019-04-15 09:16:59 -07:00 |
|
unknown
|
d342d93ec9
|
fix material targets when re-opening properties to same entity
|
2019-04-12 14:49:59 -07:00 |
|
Thijs Wenker
|
00a024fde2
|
fixing materialTargets, after the rebase
|
2019-04-12 20:06:32 +02:00 |
|
Thijs Wenker
|
c283c062c1
|
CR changes
|
2019-04-12 19:32:05 +02:00 |
|
Thijs Wenker
|
8b24cf51de
|
enhance the multi editing experience
|
2019-04-12 19:32:05 +02:00 |
|
Thijs Wenker
|
8e97c4f3f2
|
multi-editing support for properties
|
2019-04-12 19:30:12 +02:00 |
|
Thijs Wenker
|
71770e3f4e
|
move entity selection update code to its own function
|
2019-04-12 19:29:36 +02:00 |
|
Thijs Wenker
|
aef4f28194
|
unused variables / missing semi-colon
|
2019-04-12 19:26:03 +02:00 |
|
Seth Alves
|
feda884c71
|
remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts.
|
2019-04-12 09:21:48 -07:00 |
|
Shannon Romano
|
13fb3148a5
|
Merge pull request #15352 from dback2/materialTargetMasterFollowup
Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master
|
2019-04-11 17:53:05 -07:00 |
|
Ryan Huffman
|
f2474b4d2b
|
Fix lack of ranges on numerical types in Create
|
2019-04-11 14:20:52 -07:00 |
|
Sam Gateau
|
081fdf14ef
|
Merge pull request #15283 from kitely/fix-script-warnings
case 21978: Eliminated some JavaScript warnings due to missing commas
|
2019-04-10 11:28:04 -07:00 |
|
unknown
|
ca7cfc0240
|
only call onMove on lastMouseEvent change
|
2019-04-10 09:56:35 -07:00 |
|
unknown
|
d63c733b85
|
move undo edits after creates/deletes
|
2019-04-08 16:05:13 -07:00 |
|
unknown
|
1537d4351d
|
CR changes from PR 15325
|
2019-04-08 14:07:25 -07:00 |
|
unknown
|
b8b9035f9d
|
fix avatar/shape material targets, refresh material target when parent changes
|
2019-04-08 13:43:22 -07:00 |
|
Thijs Wenker
|
98e0164964
|
Merge pull request #15281 from kitely/copy-grandchild-entities
case 21980: Allow copying grandchild entities
|
2019-04-08 19:59:46 +02:00 |
|
Ryan Huffman
|
aff80dec26
|
Merge pull request #15325 from dback2/dynamicMaterialTargetProperties
Case 20738: add dynamic multiselect for material target property
|
2019-04-05 17:55:26 -07:00 |
|
Shannon Romano
|
7e354a953b
|
Merge pull request #15276 from huffman/fix/new-properties-in-create
Case 20739: Add new web and base properties to Create
|
2019-04-05 16:55:19 -07:00 |
|
Ryan Huffman
|
a4919320b3
|
Merge pull request #15277 from dback2/editHandleContinualTranslateFix
Case 20896: Fix continual edit handle translation when moving
|
2019-04-05 15:40:57 -07:00 |
|
unknown
|
f2aa155e1e
|
tweak style, add scrolling
|
2019-04-05 15:35:37 -07:00 |
|
unknown
|
4f4ec064e4
|
add dynamic multiselect for material targets
|
2019-04-05 15:35:37 -07:00 |
|
Ryan Huffman
|
9c4b3f017f
|
Remove min/max on web entity maxFPS
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
|
2019-04-05 15:08:48 -07:00 |
|
Sam Gateau
|
9581f5c958
|
separating the group header container
|
2019-04-05 08:44:49 -07:00 |
|
Sam Gateau
|
3ddde35d8f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp
|
2019-04-03 16:56:17 -07:00 |
|
r3tk0n
|
874fb6b6d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-04-03 12:42:33 -07:00 |
|
Sam Gondelman
|
1cc2cd3194
|
Merge pull request #15237 from SamGondelman/particleShapes
Case 21859: Particle Entity emitter shapes, including model
|
2019-04-03 11:03:33 -07:00 |
|
unknown
|
8dbdee4262
|
better fix for trailing key events
|
2019-04-03 09:08:29 -07:00 |
|
David Back
|
93fc8e2e18
|
fix continual translation when moving
|
2019-04-02 15:11:32 -07:00 |
|
Ryan Huffman
|
ea2e62c1ca
|
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities
Case 20826: Add damping to new dynamic entities in Create
|
2019-04-02 14:28:35 -07:00 |
|
Sam Gondelman
|
414a39bd8a
|
Merge branch 'master' into particleShapes
|
2019-04-01 22:20:13 -07:00 |
|
r3tk0n
|
4fb7bbabe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-04-01 14:52:21 -07:00 |
|
Wayne Chen
|
abe5748e60
|
Merge branch 'master' into newAudioMuteStates
|
2019-04-01 12:24:46 -07:00 |
|
Saracen
|
90e979bda7
|
Add option to disable triggering an away state when interface
focus is lost.
|
2019-03-31 18:44:16 +01:00 |
|
Shannon Romano
|
c5e7c63d38
|
Merge pull request #15289 from roxanneskelly/Case20499
Case 20499 - Scripts that use AppUI don't call `that.onClosed()` if the script is restarted while the app is open
|
2019-03-29 17:05:21 -07:00 |
|
Shannon Romano
|
a83b90cdc6
|
Merge pull request #15044 from sethalves/lock-wearables
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
|
2019-03-29 10:41:21 -07:00 |
|
Wayne Chen
|
3c65b92ff5
|
moving text position higher
|
2019-03-29 10:41:16 -07:00 |
|
Wayne Chen
|
248f9ba375
|
adding mute overlay back into HMD and have warn when muted disable in desktop
|
2019-03-29 10:32:13 -07:00 |
|
Ryan Huffman
|
bcb38b6626
|
Add damping to new dynamic entities in Create
|
2019-03-29 09:01:42 -07:00 |
|
Roxanne Skelly
|
44b92c542b
|
Case 20499 - Scripts that use AppUI don't call that.onClosed() if the
script is restarted while the app is open
|
2019-03-28 16:05:24 -07:00 |
|
Roxanne Skelly
|
73cf51182e
|
Merge pull request #15262 from roxanneskelly/Case20832
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
|
2019-03-28 12:01:24 -07:00 |
|
Oren Hurvitz
|
a00c9893a1
|
Eliminated some JavaScript warnings due to missing commas
|
2019-03-28 16:06:31 +02:00 |
|
Oren Hurvitz
|
69ebf1629d
|
Allow copying grandchild entities.
Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.
|
2019-03-28 11:00:09 +02:00 |
|
Ryan Huffman
|
9abd0943ff
|
Add new web and other properties to Create
|
2019-03-27 16:29:04 -07:00 |
|
Wayne Chen
|
f3708ba27b
|
Merge branch 'master' into newAudioMuteStates
|
2019-03-27 15:49:39 -07:00 |
|
Seth Alves
|
e085a00256
|
cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open
|
2019-03-27 10:12:58 -07:00 |
|