Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45171 commits 29 branches 0 tags 1.1 GiB
Commit graph

389 commits

Author SHA1 Message Date
Anthony J. Thibault
0ce970408c Fix for double rendering of equip hotspots 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975 Reduce calls to Entity.getEntityProperties(). 
By using a single EntityProprtiesCache instance instead of one per controller.
 2016-07-13 19:13:39 -07:00
Stephen Birarda
aa433e7233 handle click event on overlays only when in ignore mode 2016-07-13 16:23:40 -07:00
Stephen Birarda
946c7d4644 only handle trigger events when overlays are shown 2016-07-13 16:21:12 -07:00
Stephen Birarda
61975fe33a use correct function for peeked overlay 2016-07-13 15:47:52 -07:00
Stephen Birarda
9deb9744c6 handle trigger off in controller mapping 2016-07-13 15:34:20 -07:00
Stephen Birarda
cd1c114807 enable the trigger mapping so it's actually usable 2016-07-13 15:20:31 -07:00
Stephen Birarda
a6f39d5e68 add code from entitySelectionTool to handle hmd overlay pick 2016-07-13 15:06:31 -07:00
Stephen Birarda
5fc2afe549 switch to new icon for ignore target 2016-07-13 15:06:31 -07:00
Stephen Birarda
599d9c568a remove unneeded check from copy-paste 2016-07-13 15:06:31 -07:00
Stephen Birarda
aeabae4faf handle removal of an overlay for an avatar that is removed 2016-07-13 15:06:31 -07:00
Stephen Birarda
7bd8c45098 add the correct ignore icon, cleanup data structure 2016-07-13 15:06:31 -07:00
Stephen Birarda
22ab3fc7b5 cleanup a couple of comments 2016-07-13 15:06:31 -07:00
Stephen Birarda
154834b0ab hook up ignoring of user to overlay 2016-07-13 15:06:31 -07:00
Stephen Birarda
3c330d0c48 show simple overlay for script testing 2016-07-13 15:06:31 -07:00
Stephen Birarda
8724f0d0d9 add a stubbed version of the ignore script 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Seth Alves
1999193907 split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely 2016-07-12 11:42:58 -07:00
Seth Alves
367c26a5ee wait a bit before resetting collides-with-my-avatar 2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52 finish merge 2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12 less changes to hand grab 2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07 cleanup 2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752 play nice with grab 2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63 cleanup comments etc 2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211 fix some bugs and also change it to use arrival mode 2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e Equip hotspots render when your hand is near them. 2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053 make thumb and trigger work in any order and on either button released 2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c add new target model 2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177 make thumb and trigger mode an option 2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
Anthony J. Thibault
2db8160568 handControllerGrab improvements 
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
 2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
SamGondelman
6a44ea76e5 fixed snapshot preview on windows 2016-07-06 11:57:29 -07:00
Andrew Meadows
76cb80112e support new shape types in edit.js 2016-07-06 10:51:43 -07:00
James B. Pollack
b0494ec9d5 bug notes 2016-07-05 17:48:30 -07:00
SamGondelman
4eb94f8ccb added support for snapshot notification in HMD, although 3d image overlays seem to be broken in master 2016-07-05 17:40:33 -07:00
James B. Pollack
26950eaaa6 working second model adjustment with hack but wtf 2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6 working initial beam, still trying to clear up no intersection beam issues 2016-07-05 17:25:21 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88 add stuff for fading in/out and also for a nice stretchy beam 2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72 add teleport models etc 2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0 Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
David Rowe
760f4366e1 Don't show users border when hover mouse if logged out 2016-07-02 11:25:04 +12:00
James B. Pollack
00ce75ef48 more notes 2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26 cleanup 2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99 teleportr 2016-07-01 15:19:37 -07:00
howard-stearns
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -07:00
James B. Pollack
4762091aaf add easy mode 2016-07-01 11:12:20 -07:00
howard-stearns
43c7fd1e27 New art. 2016-07-01 10:34:13 -07:00
howard-stearns
804a187a7b Mute changes. 2016-07-01 10:17:17 -07:00
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots 
equip-hotspots feature
 2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1 fix vive bug 2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77 notes 2016-06-30 17:05:16 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
James B. Pollack
82e074de0f working teleporter 2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4 equip bug fix 
you should not be able to equip an object that is already equipped, with your other hand.
 2016-06-30 16:00:18 -07:00
Brad Davis
dfb6cb1aa3 Updating entity list 2016-06-30 14:25:36 -07:00
Anthony J. Thibault
82b1cba81d equip improvements 
Allow the user to equip an object while near or far grabbing it from the other hand.
 2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3 Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered 2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757 Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area 
limit hand controller actions to recommended area
 2016-06-30 11:06:32 -07:00