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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
Seth Alves
|
d25d290394
|
refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term
|
2019-03-27 10:12:58 -07:00 |
|
Seth Alves
|
e6c279ee5b
|
unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers
|
2019-03-27 10:12:58 -07:00 |
|
Seth Alves
|
fa36f12145
|
lock wearables when adjust-wearables page is opened
|
2019-03-27 10:12:57 -07:00 |
|
Seth Alves
|
4fe94a4b32
|
when new wearables are added or removed, rerun getWearablesLocked() and update UI
|
2019-03-27 10:12:57 -07:00 |
|
Seth Alves
|
29af3b1612
|
add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
|
2019-03-27 10:12:57 -07:00 |
|
Seth Alves
|
84385e6061
|
work around fb-21767 with a timer
|
2019-03-26 09:40:22 -07:00 |
|
Seth Alves
|
4303dd589f
|
make sure equip attachment-points pulled from settings are reasonable before using them
|
2019-03-26 09:40:22 -07:00 |
|
Seth Alves
|
195472bd43
|
make equipping of clonables more reliable
|
2019-03-26 09:40:22 -07:00 |
|
Wayne Chen
|
c54e8f5569
|
showing ptt text always + hmd mode switch fix
|
2019-03-25 17:32:03 -07:00 |
|
Roxanne Skelly
|
90b9de8623
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832
|
2019-03-25 14:48:26 -07:00 |
|
Roxanne Skelly
|
1608b24be1
|
ase 20832 - Inventory app login and cancel buttons don't work on logout
|
2019-03-25 14:48:17 -07:00 |
|
r3tk0n
|
3ac42e69e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-25 11:27:31 -07:00 |
|
Wayne Chen
|
390ce9bb26
|
wip for getting AvatarInputsBar to switch accordingly
|
2019-03-22 15:34:06 -07:00 |
|
Wayne Chen
|
7b5deb692c
|
fixing x value change
|
2019-03-22 14:54:18 -07:00 |
|
Wayne Chen
|
1f71a291a5
|
displaying offset values
|
2019-03-22 14:54:18 -07:00 |
|
Wayne Chen
|
554a144b0e
|
adding tool to change avatar inputs properties
|
2019-03-22 14:54:17 -07:00 |
|
Wayne Chen
|
584fa1f17b
|
more wip
|
2019-03-22 14:54:17 -07:00 |
|
Wayne Chen
|
6cf8b06c6d
|
more wip on adding qml to adjusting ui position
|
2019-03-22 14:54:16 -07:00 |
|
Wayne Chen
|
cb715c3e55
|
fixing typos
|
2019-03-22 14:54:16 -07:00 |
|
Wayne Chen
|
b6ebdb5315
|
alpha to max value of detecting transparency
|
2019-03-22 14:54:16 -07:00 |
|
Wayne Chen
|
4cbe8cd4d1
|
Adding alpha to entities to enable transparency
|
2019-03-22 14:54:15 -07:00 |
|
Wayne Chen
|
ee1a14505a
|
adding constants, removing entity creation in cpp
|
2019-03-22 14:54:15 -07:00 |
|
Wayne Chen
|
44ed9e607b
|
cancelling out roll and pitch
|
2019-03-22 14:54:15 -07:00 |
|
Wayne Chen
|
d834c5aca1
|
adding test script for creating avatar input bar
|
2019-03-22 14:16:29 -07:00 |
|
Wayne Chen
|
d382893e75
|
staging avatar inputs for ignore radius
|
2019-03-22 14:16:28 -07:00 |
|
Roxanne Skelly
|
efffb8b819
|
Merge pull request #15239 from roxanneskelly/Case20617
Case 20617 - People app filter bar breaks when deleting connections
|
2019-03-22 11:31:46 -07:00 |
|
r3tk0n
|
86ffa44771
|
Swap flying binding to other hand.
|
2019-03-21 17:05:20 -07:00 |
|
Thijs Wenker
|
9a14cfc7df
|
make sure that onWebEventReceived has the correct context in VR
|
2019-03-21 23:46:33 +01:00 |
|
r3tk0n
|
108e8b9994
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-21 15:17:56 -07:00 |
|
r3tk0n
|
08bc47d722
|
Disable tablet button on off hand (translation hand).
|
2019-03-21 15:06:03 -07:00 |
|
r3tk0n
|
8f5a8d0caa
|
Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate.
|
2019-03-21 14:38:11 -07:00 |
|
Roxanne Skelly
|
87d75ec75c
|
Case 20617 - People app filter bar breaks when deleting connections
|
2019-03-21 12:08:42 -07:00 |
|
John Conklin II
|
4483e3c069
|
Merge pull request #15168 from danteruiz/fix-notifications-scaling
Case 21501: Notification bar text fails to render when avatar is scaled very small
|
2019-03-21 09:47:55 -07:00 |
|
SamGondelman
|
3ff0770441
|
model emitters!
|
2019-03-20 21:25:14 -07:00 |
|
Thijs Wenker
|
20c3a36308
|
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
|
2019-03-20 19:43:37 +01:00 |
|
Roxanne Skelly
|
640b05304a
|
Case 21392 - Excise unneeded code from marketplacesInject.js
|
2019-03-19 16:24:07 -07:00 |
|
Thijs Wenker
|
19c51b25d1
|
don't ignore updates that originate from entityPropertiesTool itself
|
2019-03-20 00:18:21 +01:00 |
|
r3tk0n
|
c9ade7ccb8
|
Add grip to fargrab.
|
2019-03-15 16:09:01 -07:00 |
|
danteruiz
|
5dab4c0010
|
remove white-space
|
2019-03-15 10:47:48 -07:00 |
|
Thijs Wenker
|
aeb56ff22a
|
EntityList -> re-focus the rename field rather then re-selecting the text fully
EntityProperties -> ignore selection updates when nothing is changed and window is focused
|
2019-03-14 01:26:06 +01:00 |
|
danteruiz
|
1e354fb280
|
fix notications scaling
|
2019-03-12 17:18:15 -07:00 |
|
Wayne Chen
|
0279373d11
|
Merge branch 'master' into ptt
|
2019-03-11 17:09:37 -07:00 |
|
Wayne Chen
|
84b177996b
|
removing dead code
|
2019-03-11 16:43:26 -07:00 |
|
r3tk0n
|
39342b9771
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-11 16:27:05 -07:00 |
|
Wayne Chen
|
36c2358dc0
|
Merge branch 'master' into muteWarningModified
|
2019-03-11 14:35:13 -07:00 |
|
Shannon Romano
|
864c37d310
|
Merge pull request #15155 from sethalves/fix-clonables
Fix cloneables
|
2019-03-11 14:17:20 -07:00 |
|
Seth Alves
|
e515e9cc66
|
fix cloneEntity function
|
2019-03-11 12:38:54 -07:00 |
|
Seth Alves
|
2fb5e1ebc2
|
quiet some logging
|
2019-03-11 12:36:29 -07:00 |
|
Roxanne Skelly
|
e4e8a61328
|
Case 21326 - missing marketplaceInject.js
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
|
2019-03-11 10:46:51 -07:00 |
|
r3tk0n
|
ec0cf3ee3a
|
Fix typo.
|
2019-03-11 09:58:20 -07:00 |
|
Wayne Chen
|
3dcc53a945
|
Merge branch 'master' into ptt
|
2019-03-10 17:14:54 -07:00 |
|
Shannon Romano
|
ca87e217bd
|
Merge pull request #15097 from wayne-chen/audioSettingsModified
Case 21562: Audio settings screen
|
2019-03-08 16:22:52 -08:00 |
|
Wayne Chen
|
18b86d550d
|
adding PushToTalk action
|
2019-03-08 16:07:48 -08:00 |
|
r3tk0n
|
5f48a6d104
|
Fix typo.
|
2019-03-08 16:07:47 -08:00 |
|
r3tk0n
|
24d6646e8d
|
Fix activation / deactivation criteria for PTT controller module.
|
2019-03-08 16:07:47 -08:00 |
|
r3tk0n
|
3b274c2b6e
|
Enable pushToTalk.js controller module.
|
2019-03-08 16:02:16 -08:00 |
|
r3tk0n
|
f6add9cafd
|
Add pushToTalk.js controllerModule.
|
2019-03-08 16:02:15 -08:00 |
|
Wayne Chen
|
b7d44403e1
|
updating compile failure + icons/settings update
|
2019-03-08 16:02:15 -08:00 |
|
Wayne Chen
|
7cb17b2d6e
|
laying groundwork for audio app + fixing deadlocks
|
2019-03-08 16:02:14 -08:00 |
|
r3tk0n
|
15d49fd9a9
|
Initial implementation (deadlocks still occurring in Audio.cpp)
|
2019-03-08 16:02:14 -08:00 |
|
Roxanne Skelly
|
e94d248ac5
|
Merge pull request #15126 from howard-stearns/domainUnlimited
unlimited certified copies in a domain
|
2019-03-08 10:23:42 -08:00 |
|
Shannon Romano
|
e776cf2627
|
Merge pull request #15127 from danteruiz/fix-websurface-module
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
|
2019-03-07 16:04:57 -08:00 |
|
Shannon Romano
|
45ab5efcef
|
Merge pull request #15121 from danteruiz/fix-stylus-gizmo
Case 21603: Tablet x button is nearly impossible to hit with stylus
|
2019-03-07 16:03:13 -08:00 |
|
Shannon Romano
|
b567fd6cac
|
Merge pull request #15105 from danteruiz/disable-entity-scaling
Case 20830: Disable entity scaling while grabbing
|
2019-03-07 16:01:34 -08:00 |
|
Shannon Romano
|
37727c8b60
|
Merge pull request #14938 from dback2/draggableNumberDisabled
Case 20662: Entity Properties - fix disabling draggable numbers
|
2019-03-07 15:33:21 -08:00 |
|
danteruiz
|
87cfbe48d1
|
fix webSurfaceIntersection
|
2019-03-07 13:11:18 -08:00 |
|
danteruiz
|
05dc30a740
|
more requested changes
|
2019-03-07 10:49:37 -08:00 |
|
danteruiz
|
9ca3805499
|
making requested changes
|
2019-03-07 10:27:16 -08:00 |
|