Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 20:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69406 commits 72 branches 56 tags 1.2 GiB
Commit graph

142 commits

Author SHA1 Message Date
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
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
80adad7965 myAvatar constant 2018-06-22 13:52:43 -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
54145e0310 use previous pick ray when translate reaches end 2018-06-20 15:53:38 -07:00
David Back
7704e8c2a9 fix stretching too far, improve stretch sphere vs camera dist sizing 2018-06-20 14:47:41 -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
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
6ef8206f3a temp disable myAvatar collisions when stretching 2018-06-15 17:32:03 -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
David Back
cde111d601 remove pointing at system overlay and overlay at point checks 2018-06-12 17:55:04 -07:00
David Back
d20d594ae5 use setCollisionEnabled for avatar collisions 2018-05-31 10:50:54 -07:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
David Rowe
1ccde9a1b2 Disable moving selection when camera is in inside bounding box 2018-05-06 20:53:20 +12:00
David Rowe
8fd972fce9 Don't disable lasering on particle or light entity icon when is selected 2018-05-06 20:23:49 +12:00
David Rowe
ed1391581e Merge branch 'master' into 21863 2018-05-05 16:49:51 +12:00
David Rowe
ebd46f1861 Fix intermittent ability to select particle and light entities 2018-05-03 14:43:54 +12:00
David Rowe
5312c81a6f Match style of surrounding code 2018-05-03 08:49:18 +12:00
David Rowe
4a96dc2fdc Refactor 2018-05-03 08:48:17 +12:00
David Rowe
f27e363b68 Remove entity from list when it deletes; handle multiple deletions 2018-05-02 15:23:13 +12:00
Thijs Wenker
b741888d77 CR feedback (for real) 2018-04-17 20:31:30 +02:00
Thijs Wenker
91467b6059 CR feedback 2018-04-17 20:30:00 +02:00
Thijs Wenker
0aa0f53925 edit.js - remove ability to clone non-owned avatar-entities 2018-04-17 19:46:45 +02:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Seth Alves
249a97b5d0 don't move or rotate children if a parent is being changed by the same action 2018-04-03 12:14:59 -07:00
Seth Alves
08b7326bd1 when moving a group of selections, don't move a child if a parent is being moved 2018-04-03 12:14:40 -07:00
unknown
194b00d732 fix translate arrow normals 2018-03-26 16:31:58 -07:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
David Rowe
b1f49be790 Merge branch 'master' into 21742 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 10:04:32 +13:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Back
51b55aedcf CR changes, fix colors, add minimum overlay dimensions for HMD 2018-02-06 16:07:46 -08:00
David Back
ececd1c60f fix loop index change 2018-02-02 17:14:48 -08:00
David Back
ed4cbe2679 fix fill ring rotation 2018-02-02 17:05:25 -08:00
David Back
900669d937 fix multi-selection rotation yay! 2018-02-02 16:44:59 -08:00