Commit graph

516 commits

Author SHA1 Message Date
Brad Davis
dfb6cb1aa3 Updating entity list 2016-06-30 14:25:36 -07:00
Anthony J. Thibault
43d4dba4c0 iterate over hotspots not entities.
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473 WIP, equip-points work but they don't use the proper attach point. 2016-06-29 13:53:06 -07:00
Brad Hefta-Gaub
1af455b8b9 Merge pull request #8135 from SamGondelman/fixEditLockHMD
Prevent entering independent camera mode through edit.js in HMD mode
2016-06-27 15:50:25 -07:00
SamGondelman
d5feac94f4 coding standard fun 2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6 can't enter independent mode through edit.js in HMD mode 2016-06-24 16:23:15 -07:00
Anthony J. Thibault
2a82dddc2b Draw attach points as if they were equip-hotspots 2016-06-21 17:36:36 -07:00
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
Seth Alves
73c06b3bf4 updating attachedEntitiesManager to work with new system 2016-05-11 14:13:08 -07:00
Brad Hefta-Gaub
5314755e0d Merge pull request #7782 from ctrlaltdavid/20898
Automatically upgrade toolbar position to bottom center of window
2016-04-28 16:37:34 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
David Rowe
1cf53829d3 Fix upgrading for all toolbar buttons 2016-04-29 08:20:20 +12:00
David Rowe
b7188bad30 Automatically upgrade toolbar position to bottom center of window 2016-04-29 07:13:56 +12:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00