Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 13:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71094 commits 67 branches 56 tags 1.2 GiB
Commit graph

6362 commits

Author SHA1 Message Date
Sam Gateau
09d33177fc Adjust Workload and better representation of the workload debuging features 2018-08-06 15:36:25 -07:00
David Back
112327a3c1
Merge pull request #13735 from dback2/entityCameraKeyFix 
Use key codes for entity camera keys
 2018-08-06 14:07:48 -07:00
David Rowe
83ed572a33 Render Touch controllers at physical hands's locations 2018-08-04 19:27:44 +12:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
David Back
0b9e520b53 fix grab cloning parented entitiy 2018-08-01 16:00:25 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity 
Fix added entities not being undoable in Create
 2018-08-01 13:11:17 -07:00
David Back
cdbf75666f new line 2018-08-01 12:46:49 -07:00
David Back
f946bb73ef remove constants 2018-08-01 12:46:17 -07:00
David Back
97e45643b0 spacing 2018-08-01 12:44:40 -07:00
David Back
ca3151ae39 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix 2018-08-01 12:43:04 -07:00
David Back
3e9e00f1d6 use key codes for entity camera keys 2018-08-01 12:42:50 -07:00
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user 
Fix duplication not working as expected on grabbed entities
 2018-08-01 19:25:33 +02:00
SamGondelman
e11030bbc3 mukul's changes, enable parabolic teleport 2018-08-01 09:46:17 -07:00
Ryan Huffman
6369cee0d1 Fix added entities not being undoable in Create 2018-08-01 09:40:29 -07:00
David Back
e8068fea0a block selecting overlays with other hand 2018-07-31 17:18:35 -07:00
Ryan Huffman
bbdc7ba380 Fix Uuid null comparison and dangling comma in Create tool 2018-07-31 13:57:27 -07:00
David Back
ad9ec26781 print 2018-07-31 11:53:17 -07:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
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
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent 
MS15184: Remove deprecated functions in Agent API
 2018-07-30 14:48:10 -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
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
Thijs Wenker
e2d7431456 move agent scripting interface to its own class to get rid of deprecated API 2018-07-24 16:54:24 +02: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
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
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
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
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
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
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
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