Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-17 23:20:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70106 commits 23 branches 28 tags 1.2 GiB
Commit graph

4602 commits

Author SHA1 Message Date
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
David Back
cde111d601 remove pointing at system overlay and overlay at point checks 2018-06-12 17:55:04 -07:00
Zach Fox
ffb9a47be0
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots 
Interface Fix for MS14314: Make use of original image filename when sharing
 2018-06-12 15:10:22 -07:00
Anthony Thibault
717093abf7
Merge pull request #13171 from luiscuenca/handTouchToDefault 
Enable Avatar Hand Touch Script by Default
 2018-06-12 14:54:26 -07:00
Zach Fox
bf5d6de780 Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots 2018-06-12 11:19:05 -07:00
Zach Fox
cf9cf45d02
Merge pull request #13348 from zfox23/MS14129_buyButtonStuck 
Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state
 2018-06-12 11:02:52 -07:00
Dante Ruiz
f1d11f9566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-12 10:21:12 -07:00
Luis Cuenca
9126a6f66d
hide debug lines 2018-06-12 10:12:28 -07:00
Zach Fox
860f9db939 Remove logging 2018-06-12 09:25:09 -07:00
Zach Fox
14034f29a1 Interface Fix for MS14314: Make use of original image filename when sharing 2018-06-11 17:10:09 -07:00
Sam Gondelman
e8ec32c7f8
Merge pull request #13340 from SamGondelman/modelTextures 
Try to fix ModelOverlay texture loading
 2018-06-11 16:09:10 -07:00
Dante Ruiz
6685fbbfc4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 13:56:54 -07:00
Dante Ruiz
f2d6b84e6c fix qa fail issues 2018-06-11 13:56:44 -07:00
John Conklin II
9db71fb40d
Merge pull request #13322 from dback2/fixEquipMessage 
Fix Hifi-Grab-Hand message for equipping
 2018-06-11 13:16:39 -07:00
Zach Fox
a5ef3fa729 Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state 2018-06-11 12:00:51 -07:00
John Conklin II
d5b8570ef6
Merge pull request #13343 from ctrlaltdavid/21888 
Fix tablet attaching to hand while far-grabbing an entity
 2018-06-11 10:26:37 -07:00
Howard Stearns
5ce122f148
Merge pull request #13307 from howard-stearns/infinite-scroll 
Infinite scroll
 2018-06-11 10:03:52 -07:00
Sam Gondelman
9c66ee412a
Merge pull request #13325 from Cristo86/patch-1 
Use third person camera mode when switching to My View from Top View mode.
 2018-06-11 09:36:29 -07:00
Dante Ruiz
ba86c9753d Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 09:13:14 -07:00