Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 22:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71864 commits 69 branches 58 tags 1.2 GiB
Commit graph

4920 commits

Author SHA1 Message Date
John Conklin II
8e277758ad
Merge pull request #13700 from danteruiz/fix-grabbing-problem 
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
 2018-07-31 09:46:57 -07:00
David Back
03f0116b79 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:28:14 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
David Back
b420ef8cf2 fix trigger clicks on vive 2018-07-30 13:21:09 -07:00
David Back
bec54cc182 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 12:26:48 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Thijs Wenker
d486a0721d
Merge pull request #13698 from dback2/resetPropertiesNoSelection 
Reset entity property fields when no selection
 2018-07-30 19:37:12 +02:00
Dante Ruiz
0f46001f9a remove redundent variable 2018-07-30 10:29:53 -07:00
Dante Ruiz
4caf613269 making requested changes 2018-07-30 10:19:27 -07:00
David Back
398c530214 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 10:18:19 -07:00
Wayne Chen
c8845e1a23 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-28 09:42:12 -07:00
Dante Ruiz
cf6850de48 better stuff 2018-07-27 17:53:21 -07:00
Dante Ruiz
887a416656 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 17:50:12 -07:00
Dante Ruiz
6320401308 somewhat better distance from bounding box 2018-07-27 17:49:49 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot 
Particles don't spin with head roll, new spin + rotateWithEntity properties
 2018-07-27 14:54:48 -07:00
Thijs Wenker
9dce1b64b6
Merge pull request #13695 from huffman/fix/create-focus-on-create 
Fix edit.js not being able to delete after creating entity
 2018-07-27 22:43:34 +02:00
Ryan Huffman
103f9e04fa Fix duplication not working as expected on grabbed entities 2018-07-27 13:32:12 -07:00
Dante Ruiz
30b4815bf9 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 13:13:10 -07:00
David Rowe
3bfdd3ff58 Maintain virtual and real world orientations when teleport 2018-07-27 15:18:40 +12:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
David Back
dcdf734114 remove unneeded 2018-07-26 16:43:07 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
Dante Ruiz
74bb2301b0 minimize diff 2018-07-26 16:05:56 -07:00
Dante Ruiz
31d31af941 minimize diff 2018-07-26 16:05:18 -07:00
David Back
ff6ed971d8 comments, re-org, submesh number 2018-07-26 15:40:27 -07:00
Dante Ruiz
02232daa58 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-26 15:26:24 -07:00
Dante Ruiz
6edd109dfe revert back to the old way we checkForChildTooFarAway 2018-07-26 15:23:54 -07:00
SamGondelman
74b3143bc3 remove scaling from teleport script 2018-07-26 12:23:14 -07:00
howard-stearns
699d1647ca typo, and more conservative item limit 2018-07-26 12:01:56 -07:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
SamGondelman
1c1b68ee66 emitterShouldTrail fix, review comments, rotateWithEntity 2018-07-26 11:41:16 -07:00
Thijs Wenker
6e23caca0d handle both wantsTrigger and triggerable in CreateApp 2018-07-26 20:25:42 +02:00
David Back
cb8e9f218b reset all property fields when no selection 2018-07-26 11:23:28 -07:00
Zach Fox
cc921ed9c4
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids 
Fix MS16820: Rate limit Snapshot Polaroids
 2018-07-25 15:45:51 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
Ryan Huffman
0e0966004c Fix edit.js not being able to delete after creating entity 
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
 2018-07-25 14:52:56 -07:00
Sam Gondelman
2aeef2e016
min spinSpread is 0 2018-07-25 09:40:52 -07:00
Sam Gondelman
b4cc9c8004
typo 2018-07-25 09:36:43 -07:00
SamGondelman
4750611af9 particles don't spin with head roll, add particle spin properties, negative emitSpeed 2018-07-24 23:47:58 -07:00
Zach Fox
04754d0dab Fix MS16820: Rate limit Snapshot Polaroids 2018-07-24 15:28:37 -07:00
Alexander Ivash
6db46e84ff FB17036 Avatar App causes error on cache reload (CTRL+R) 2018-07-25 01:11:26 +03:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
Thijs Wenker
b7d12c6b1c
Merge pull request #13656 from huffman/fix/create-selection-box 
Fix the Create selection box not always matching outline
 2018-07-24 19:49:20 +02:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
Wayne Chen
c0dfbac480 adding comment for possible solution - still WIP 2018-07-24 10:04:51 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
Wayne Chen
e4a5be668a adding check function for pointing at near grabbable entity 2018-07-23 12:29:01 -07:00
Wayne Chen
1ec136a19c removing debug overlay statements 2018-07-23 12:18:26 -07:00
Wayne Chen
a2aeacab64 adding fix for near grabbing with web entity 2018-07-23 12:17:19 -07:00
Wayne Chen
89f9cd089f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-23 11:51:39 -07:00
Ryan Huffman
d1da7675f6
Merge pull request #13648 from huffman/fix/create-xz-lines 
Fix xz guides not showing when translating with Shift
 2018-07-23 10:44:47 -07:00
Seth Alves
4f45fbc5f5
Merge pull request #13661 from danteruiz/avatarapp-undefined-data 
fix avatar app from crashing when avatar entity variable is undefined.
 2018-07-23 10:18:31 -07:00
Seth Alves
a6a4dd3b8e
Merge pull request #13570 from danteruiz/fix-tablet-material-entities 
clean up tablet material entities  and don't display them in create menu
 2018-07-23 09:50:23 -07:00
Wayne Chen
1880c49d03 removing garbage file 2018-07-20 17:18:58 -07:00
Wayne Chen
32886d67d9 optimizing near-/far- grabbable entities a bit 2018-07-20 17:17:36 -07:00
Wayne Chen
be5fdef974 adding check in isReady for grabbing non-web entitys 2018-07-20 15:26:55 -07:00
danteruiz
9bf6cff5cd fix indent isssues 2018-07-20 12:27:51 -07:00
Ryan Huffman
ae26c5fe9a Remove extraneous logging 2018-07-20 11:38:02 -07:00
Ryan Huffman
32122a7c1f Replace magic numbers with RAIL_AXIS_LENGTH 2018-07-20 11:37:42 -07:00
danteruiz
ce3922a3c1 fix avatarEntities undefined crash 2018-07-20 11:23:02 -07:00
Wayne Chen
4e3a6cb320 adding ignore for far-/near- grabbable entities when operating on web surface 2018-07-20 11:18:20 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Wayne Chen
5276d84aa5 pushing what i coded out loud - it broke the way grabbing works 2018-07-19 17:08:12 -07:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Ryan Huffman
2305099874 Fix the Create selection box not always matching outline 2018-07-19 16:09:21 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
Wayne Chen
1942eaf68f Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:48 -07:00
Wayne Chen
b60d650843 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:38 -07:00
Ryan Huffman
25b558e6b4 Fix xz guides not showing when translating with Shift 2018-07-19 12:56:18 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Qliemillar
2163bf1ef0
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes 
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
 2018-07-19 12:34:38 -06:00
Howard Stearns
2378cdfdc6
Merge pull request #13624 from howard-stearns/app-refactor4-merge 
appUi module, and use in People app
 2018-07-19 11:07:54 -07:00
Qliemillar
3466d944fb
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual 
Disable showing the entity edit tools when undoing while disabled
 2018-07-19 09:03:40 -06:00
howard-stearns
a904182cc2 cr feedback 2018-07-18 14:03:26 -07:00
Thijs Wenker
b29044fd7e
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix 
Fix quickly clicking an edit handle causing selected entity change
 2018-07-18 22:49:11 +02:00
howard-stearns
74914ffb3e Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-18 13:16:50 -07:00
Ryan Huffman
b015845371 Disable showing the entity edit tools when undoing while disabled 2018-07-18 11:54:40 -07:00
r3tk0n
a9eb8103f6 Clean up comments a bit. 2018-07-18 09:52:25 -07:00
r3tk0n
f7b49598b5 Disabled tip boxes for Vive controllers, as per experience team request. 2018-07-18 09:50:59 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
Wayne Chen
ac642f126a adding extra conditional to ensure all modules are checked 2018-07-17 20:52:50 -07:00
Wayne Chen
30ca5a8cbd code cleanup to use web laser if laser is not pointing at grabbable entity 2018-07-17 16:44:49 -07:00
Wayne Chen
eb7bde1bfc switching near grab priority to be before web surface laser 2018-07-17 15:38:56 -07:00
Wayne Chen
f444d0ae28 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-17 15:03:04 -07:00
Qliemillar
07a7bbbcf6
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master 
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
 2018-07-17 14:36:55 -06:00
howard-stearns
bfd9e208b5 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-17 12:31:18 -07:00
Wayne Chen
2c16c6579f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-17 11:54:15 -07:00
Wayne Chen
813c58a1fb adding check to see if near grabbing is ready 2018-07-17 11:53:55 -07:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
Qliemillar
42daa33d11
Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering 
fix parent grab dropping and cullig flickering when flying at high velocities
 2018-07-17 08:53:41 -06:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
howard-stearns
cb5ac6f42c Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge 2018-07-16 17:43:53 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
howard-stearns
2c92b02b95 lint 2018-07-16 16:28:44 -07:00
howard-stearns
f1fed37763 cleanup 2018-07-16 15:58:01 -07:00
howard-stearns
4e6aa34814 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4 2018-07-16 13:07:08 -07:00
howard-stearns
ffa5259319 cleanup references to button, tablet 2018-07-16 13:06:12 -07:00
howard-stearns
46061a2a15 initial with pal 2018-07-16 11:54:05 -07:00
Dante Ruiz
20a8275343 min diff 2018-07-16 11:43:29 -07:00
Dante Ruiz
fa2b975e8f undo some wrong changes 2018-07-16 11:42:38 -07:00
Dante Ruiz
0fa2a71d0f actually fix requested changes 2018-07-16 11:35:53 -07:00
Dante Ruiz
d81420542c making PR requests 2018-07-16 11:00:27 -07:00
Dante Ruiz
47eb7a0899 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering 2018-07-16 10:04:42 -07:00
Qliemillar
511b297be5
Merge pull request #13597 from dback2/entityListDeleteSpamFix 
Fix entity list refresh when entity deleted
 2018-07-16 09:49:25 -06:00
David Back
46a9521939 fix selecting an edit handle causing selected entity change 2018-07-13 17:40:24 -07:00
Zach Fox
c3ffe7eb97 Fix bubble shading; fix audio loudness calculation 2018-07-13 13:55:32 -07:00
David Back
c225c3deca
Merge pull request #13608 from dback2/alignSelectionToGridFix 
Fix aligning selection to grid
 2018-07-13 13:33:26 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
David Back
0a738e36a8
Merge pull request #13569 from dback2/hmdHandlesInBoundingBox 
Only clamp edit handles in HMD when outside bounding box
 2018-07-13 10:55:54 -07:00
unknown
151f948b26 prints 2018-07-12 19:26:20 -07:00
unknown
acae4df3c3 fix align to selection to grid 2018-07-12 19:23:06 -07:00
Alexander Ivash
437f49ac22 16683 Avatar App - Add to Favorites Button Not Working 2018-07-13 03:01:02 +03:00
Zach Fox
fa518b995a Fix my audio level 2018-07-12 15:16:54 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Zach Fox
ee08ef981d Slightly increase linear damping 2018-07-11 10:44:24 -07:00
Zach Fox
6218f80387 MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor 2018-07-11 10:07:02 -07:00
Zach Fox
2fad55e5d0 Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to 2018-07-10 15:56:13 -07:00
Dante Ruiz
1cc95fbf76 better fix 2018-07-10 11:05:41 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
David Back
7a7b9730ee only clamp handles in hmd outside bounding box 2018-07-09 15:36:22 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00
David Back
8f1ad8e367
Merge pull request #13538 from dback2/editHandleMacFix 
Edit handle undefined event fix
 2018-07-09 12:08:18 -07:00
John Conklin II
79b2858220
Merge pull request #13543 from ctrlaltdavid/M16392 
Create snap-to-grid and translation fixes
 2018-07-09 11:39:26 -07:00
David Back
d4f43a56f2
Merge pull request #13556 from dback2/deselectInput 
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
 2018-07-09 10:40:33 -07:00
David Back
17220b9360
Merge pull request #13549 from dback2/parentChildCopy 
Re-parent entities after duplicating and duplicate children with parents
 2018-07-09 10:06:18 -07:00
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
David Back
3bcc727d47 check controller triggered in checkControllerMove 2018-07-06 18:57:32 -07:00
David Back
f33fae30ed Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix 2018-07-06 18:56:09 -07:00
David Back
d04c2eaf73 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 18:01:16 -07:00
David Back
f815ad1ddd tabs 2018-07-06 17:02:41 -07:00
David Back
c271e1aae4 fix triggering at non-web overlays 2018-07-06 17:02:29 -07:00
Alexander Ivash
7feb9910c9 use rotation degrees instead of quaternions for comparison 
re-query entity properties after editing it to get actual changes
 2018-07-07 02:36:19 +03:00
Alexander Ivash
168584169c do not close avatarapp on hiding tablet 2018-07-07 02:36:19 +03:00
Alexander Ivash
19f37246a6 capitalize avatarapp name in toolbar/tablet icons 2018-07-07 02:36:19 +03:00
David Back
a546d8b279 tabs 2018-07-06 15:48:53 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
David Back
33e170315c recurse on children of children 2018-07-06 15:39:18 -07:00
David Back
a415d1eb37 Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy 2018-07-06 14:32:17 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
8021434984 remove debug tracing 2018-07-06 21:00:56 +03:00
Alexander Ivash
5990d2725a disallow to scale avatar with controllers 2018-07-06 21:00:55 +03:00
Alexander Ivash
58de136dfa fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
cc151d6187 Change the name of the app from “AvatarApp” to “Avatar”. 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
73ec34825b add proper application icon 2018-07-06 21:00:54 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
c3f0cb67a6 fix for inability to ajuste wearables after cancelling changes 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
David Back
169d40c3c1 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 10:55:04 -07:00
Thijs Wenker
42afd31325 default window width fixes 2018-07-06 19:48:35 +02:00
David Rowe
1a18d3305e Code review 2018-07-06 17:03:30 +12:00
David Back
4763ccf1ec Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-05 14:53:21 -07:00
David Back
2bcc96269e comments, fix doubles in list, fix re-parenting to 0 2018-07-05 13:10:56 -07:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons 
keep buttons from drifing away from in-world display of controllers
 2018-07-05 13:09:07 -07:00
David Back
fbe670d8c0 also copy unselected children 2018-07-05 12:43:37 -07:00
David Back
1cc79f0e7c renaming 2018-07-05 12:07:13 -07:00
David Back
25d55b9cc5 tabs 2018-07-05 11:59:05 -07:00
David Back
40fec8a318 reparent after duplication 2018-07-05 11:58:45 -07:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
David Back
2e70853ffc
Merge branch 'master' into editHandleMacFix 2018-07-05 09:51:56 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall 
Implement MS16413: Improve angularVelocity of printed Snaps
 2018-07-05 09:50:06 -07:00
Thijs Wenker
574bfd177d Create app (desktop mode): 
- Fix insta-close on switching from other app to create app.
- Fix new model and particle dialogs.
 2018-07-05 17:57:00 +02:00
David Rowe
a642324a11 Fix oscillating positions as translate when snapping to grid 2018-07-05 11:58:48 +12:00
David Rowe
9709599c1a Fix translation handle not following mouse at some view angles 2018-07-05 11:47:34 +12:00
David Rowe
94c097fc39 Fix entity y value jumping when translate with grid snapping enabled 2018-07-05 11:42:37 +12:00
David Rowe
b00d07b029 ESLint 2018-07-05 10:50:08 +12:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix 
Fix toggling edit handles between local/world space
 2018-07-04 00:23:21 +02:00
David Back
986864fc53 ctrl D for deselect 2018-07-03 15:09:11 -07:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07:00
David Back
afbe64ec11 missing bracket 2018-07-03 13:32:11 -07:00
David Back
2af0f05cb4 tabs 2018-07-03 12:40:19 -07:00
David Back
ed4d0f2577 early-out if event undefined 2018-07-03 12:39:41 -07:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860 
fixing still only snap in snap app
 2018-07-03 11:36:25 -07:00
Thijs Wenker
d5fb094d8a enable Desktop.CLOSE_BUTTON_HIDES flag for create app native windows 2018-07-03 18:49:23 +02:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Thijs Wenker
7ed03c2f77 - native window presentation mode update 
- de-activate create on displayMode change.
 2018-07-03 17:26:18 +02:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 
[BugFix] EntityList UncaughtException in that.sendUpdate
 2018-07-02 12:35:20 -07:00
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate 
Resolving issue where VR input for movement stops emotes
 2018-07-02 12:30:50 -07:00
David Back
e1de226aae change toggle input to t 2018-07-02 11:11:02 -07:00
David Back
122b385dd3 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-07-02 10:57:47 -07:00
David Back
fd4a8fdd83 fix color NaN check 2018-06-29 15:33:55 -07:00
Gabriel Calero
a6d093d8c9 Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-29 15:09:32 -03:00
David Back
328bf37f64 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-29 10:34:17 -07:00
David Back
6f0ac32344 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 17:32:18 -07:00
David Back
7b9341954f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 12:10:42 -07:00
Zach Fox
2d27de12bd Fix MS14743: Change SNAP prints such that they don't fall through the floor 2018-06-28 12:06:31 -07:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
David Back
e74d30ce22 fix color fallbacks 2018-06-27 17:43:41 -07:00
Alexia Mandeville
8228afb378 Resolving issue where VR input for movement stops emotes 2018-06-27 17:15:54 -07:00
David Back
dd09ec1656 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-27 16:32:21 -07:00
John Conklin II
e9d2797573
Merge pull request #13472 from alexiamandeville/sittingUpdate69 
Restoring Emote app to stable build state, adding sit and love emotes
 2018-06-27 16:00:53 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
Alexia Mandeville
0f25ab7376
Fixing error from typo 2018-06-27 13:30:10 -07:00
David Back
2cdda23169 more robustness for optional properties 2018-06-27 13:05:39 -07:00
John Conklin II
2da3192c33
Merge pull request #13402 from ctrlaltdavid/21895 
Make desktop left and right mouse button actions independent
 2018-06-27 12:46:11 -07:00
Zach Fox
bdeb22703c
Merge pull request #13474 from zfox23/MS16235_handshakeParticles 
Fix MS16235: Set previously-buggy Handshake particle properties to 0
 2018-06-27 12:16:48 -07:00
Gabriel Calero
1e09f98f6e Pick entity or overlay depending on distance 2018-06-27 12:23:43 -03:00
John Conklin II
a38859e4da
Merge pull request #13397 from ctrlaltdavid/21893 
Fix Create app selection updating when entities are deleted
 2018-06-26 17:06:43 -07:00
Zach Fox
6f956ffb8d Fix MS16235: Set previously-buggy Handshake particle properties to 0 2018-06-26 15:45:18 -07:00
Alexia Mandeville
b3eec72c90 Removing animations.zip 2018-06-26 15:39:50 -07:00
Alexia Mandeville
6f6a9b2c64 Style formatting, updating comments 2018-06-26 15:02:46 -07:00
Alexia Mandeville
92acbdbbd7 Adding sit and love emotes 2018-06-26 14:21:10 -07:00
David Back
40b2525b99
Merge pull request #13439 from dback2/editHandleFixesImprovements 
Edit handle fixes
 2018-06-26 13:33:25 -07:00
John Conklin II
47f907f44e
Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 
Fixing collisionless grabbing
 2018-06-26 13:05:25 -07:00
David Back
46b5c0cc8e
Merge pull request #13448 from dback2/multiSelectColorInvisibleFix 
Fix multi-selection color setting visible/locked to false
 2018-06-26 11:28:58 -07:00
Gabriel Calero
48cdd6d64c Fix web entities for android 2018-06-26 12:30:03 -03:00
Gabriel Calero
7e640abb39 Support Web entities in android 2018-06-26 12:01:01 -03:00
Sam Gondelman
acfd562309
Merge pull request #13435 from gcalero/breakpad_android 
Breakpad integration for android Interface (part II)
 2018-06-25 16:47:07 -07:00
David Back
05438f3b85 bad avatar collision merge 2018-06-25 15:26:54 -07:00
David Back
f65bc9b5ed Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-25 15:22:07 -07:00
Gabriel
ea2c1298e5
Remove crash added with testing purposes only 2018-06-25 19:13:47 -03:00
Gabriel Calero
0a70e844bf Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-25 17:41:51 -03:00
Gabriel Calero
fedc0a9e61 Support web3d overlays in android 2018-06-25 16:37:03 -03:00
David Back
6fa191742c
Merge pull request #13390 from dback2/editHandleDebugWindowFix 
Prevent edit press events when pointing at tablet or desktop windows
 2018-06-25 11:11:37 -07:00
David Back
39b3e5a711 tabs 2018-06-22 18:15:16 -07:00
David Back
09ccd3acf0 fix multi-selection color setting visible/locked to false 2018-06-22 18:13:40 -07:00
David Back
88762e879f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 13:53:04 -07:00
David Back
80adad7965 myAvatar constant 2018-06-22 13:52:43 -07:00
David Back
6a4c5ed12a Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 11:58:28 -07:00
Wayne Chen
1239472f2d adding line for allowing grabbing of collisionless overlays 2018-06-22 11:35:01 -07:00
Wayne Chen
5b36449edd allowing grabbing of collisionless entities 2018-06-22 09:54:25 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
223350b7be remove logging, play with debounce times 2018-06-21 17:26:39 -07:00
David Back
c019a4816f CR changes + eslint fixes 2018-06-21 16:45:09 -07:00
David Back
ed56f09fcf comment 2018-06-21 15:00:10 -07:00
David Back
37b35353d2 space 2018-06-21 14:48:37 -07:00
David Back
e3e8de1042 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 10:24:12 -07:00
John Conklin II
835528b212
Merge pull request #13383 from dback2/autoLaserFix2 
Fix auto lasering locked web entities & only auto laser tablet and web overlays
 2018-06-21 09:21:54 -07:00
David Rowe
d43be5ce19 Code review 2018-06-21 16:35:37 +12:00
David Back
54145e0310 use previous pick ray when translate reaches end 2018-06-20 15:53:38 -07:00
Menithal
55e75298bd Added Logging 2018-06-21 01:24:32 +03:00
Menithal
903762b122 Make sure max constraints reset 
This now occurs when selecting a new entity and having the UI filled
again
 2018-06-21 01:04:01 +03:00
David Back
7704e8c2a9 fix stretching too far, improve stretch sphere vs camera dist sizing 2018-06-20 14:47:41 -07:00
Menithal
32982326b1 Moved WebBridge sync to oninput: 
This avoids the settings_update being called only when the image
finishes loaded
 2018-06-21 00:08:36 +03:00
Menithal
d878ec66e2 Added Lock for not sending settings_update 
This occurs only when fields are being filled
 2018-06-21 00:07:14 +03:00
SamGondelman
2f0877dc0f debugging js 2018-06-19 16:36:13 -07:00
David Back
633be87473 fix stretch panel dimensions 2018-06-19 14:57:46 -07:00
David Back
61cbe84ae5 fix stretching below minimum still moving entity 2018-06-19 14:39:58 -07:00
SamGondelman
de5fcccc7b proper reporting of nan values in get 2018-06-19 14:22:24 -07:00
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -07:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
David Back
5b699d1cd4 tabs 2018-06-18 16:14:46 -07:00
David Back
7d4fa4f484 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-18 15:56:05 -07:00
David Back
030e697945 fix toggling to world space 2018-06-18 15:55:55 -07:00
David Back
0c644c0504 Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2 2018-06-18 11:06:56 -07:00
David Back
175e4b7013 also check tabletID 2018-06-18 11:06:33 -07:00
David Rowe
ffd66f4377 Make desktop left and right mouse button actions independent 2018-06-18 20:55:13 +12:00
David Rowe
e8154b5df1 Fix Create app selection updating when entities are deleted 2018-06-17 08:35:45 +12:00
SamGondelman
7771661948 fix particle spread properties 2018-06-15 17:35:49 -07:00
David Back
bb0b1cc4a4 no myAvatarIndex needed 2018-06-15 17:35:18 -07:00
David Back
d16b777977 tabs 2018-06-15 17:33:49 -07:00
David Back
b10cf364c4 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-15 17:32:32 -07:00
David Back
6ef8206f3a temp disable myAvatar collisions when stretching 2018-06-15 17:32:03 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Seth Alves
b4b6c85aaf
Merge pull request #13366 from danteruiz/fixing-invisible-cursor 
fixing invisible cursor when coming from HMD mode
 2018-06-15 17:16:46 -07:00
Seth Alves
7ca6dfc8c5
Merge pull request #13371 from danteruiz/fix-focus-issues 
fix focus issues when mouse is offscreen
 2018-06-15 17:15:42 -07:00
David Back
cb9c255acd Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-15 14:51:53 -07:00
David Back
bc06b88afc tabs 2018-06-15 14:31:18 -07:00
David Back
9b33e6757f prevent edit press events when pointing at desktop window or tablet 2018-06-15 14:29:47 -07:00
Gabriel Calero
4cd94a32b8 Crash on audio button press with testing purpose 2018-06-15 17:44:28 -03:00
David Back
fcccaaea48 tabs 2018-06-14 17:49:02 -07:00
David Back
ed5b05eef4 fix auto laser on locked web entity, only auto laser at tablet or web overlays 2018-06-14 17:43:45 -07:00
David Back
3be477e7f2 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleDebugWindowFix 2018-06-14 13:14:24 -07:00
John Conklin II
fa1dc78469
Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic 
[RC69] fix cloneDynamic
 2018-06-14 12:58:17 -07:00
John Conklin II
d023d6adef
Merge pull request #13321 from danteruiz/tablet-imporvments 
Tablet improvements
 2018-06-14 12:38:20 -07:00
John Conklin II
4f561b00da
Merge pull request #13003 from alexiamandeville/sittingUpdates 
Adding sitting and love to emote app
 2018-06-14 11:52:47 -07:00
Thijs Wenker
4d3087b98c fix cloneDynamic 2018-06-14 19:07:20 +02:00
Dante Ruiz
abee3e8b96 fix focus issue when mouse is offscreen 2018-06-13 17:07:05 -07:00
Dante Ruiz
a6202cf3cb fixing invisible cursor 2018-06-13 11:31:14 -07:00
Dante Ruiz
60e46481b2 emissive maps 2018-06-13 10:41:02 -07:00