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

395 commits

Author SHA1 Message Date
David Rowe
a98824f483 Code review 2017-02-25 08:13:15 +13:00
David Rowe
d9a716bf3d If someone else is grabbing entity you want to grab show their grab beam 2017-02-24 18:42:52 +13:00
Seth Alves
ce717d04e9 merge in tablet-as-overlay code 2017-02-23 18:40:20 -08:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08:00
Seth Alves
b4be942348 trying to get tablet overlay to show up in the right place 2017-02-22 19:18:03 -08:00
Seth Alves
273f0130f3 fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug. 2017-02-22 17:43:09 -08:00
Seth Alves
bfc4853947 make overlays near-grabbable. make tablet be an overlay 2017-02-22 16:50:02 -08:00
Seth Alves
aed1d69377 don't do a haptic pulse when av's hand goes near grabbable tablet 2017-02-22 14:14:10 -08:00
Seth Alves
92580a977b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-20 13:54:12 -08:00
David Rowe
6827a28807 Fix grab position 2017-02-18 16:36:14 +13:00
David Rowe
2c5782e4bb Fix laser beam jumping upon grabbing entity 2017-02-18 09:11:04 +13:00
Seth Alves
3ea0f6d2d2 allow lasers to scroll tablet while in edit-mode 2017-02-15 11:34:48 -08:00
Seth Alves
219e569014 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 07:25:39 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
David Rowe
2672b8d10a Fix tabs 2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b Fix far grabbing making entity jump upon grab 2017-02-14 17:30:20 +13:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Philip Rosedale
e94e41698e remove debug 2017-02-08 18:04:55 -08:00
Philip Rosedale
dc957d09d8 remove comment 2017-02-08 15:45:29 -08:00
Philip Rosedale
fe92d38b60 Fixed scaling of self 2017-02-08 15:42:10 -08:00
Seth Alves
47976406fc Merge pull request #9607 from hyperlogic/bug-fix/better-haptics 
More consistent haptics on web overlays and entities
 2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971 set WANT_DEBUG_STATE back to false 2017-02-07 23:50:06 -08:00
Anthony J. Thibault
6738c0eade More consistent haptics on web overlays and entities 2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17 enforce more button clicking logic 2017-02-03 19:13:57 +00:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes 
tablet-ui: Bug fixes
 2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Dante Ruiz
0ec8071288 better scrolling and fixed button touching 2017-02-02 23:16:39 +00:00
Anthony J. Thibault
9df887de2a You can no longer scale the tablet with double-grab 2017-02-02 10:16:02 -08:00
Anthony J. Thibault
e2e19884bb Tablet should work even when not connected to any domain. 
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.

I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.

There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
 2017-01-31 13:52:12 -08:00
Dante Ruiz
b264d84385 minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88 ability to grab tablet in edit mode 2017-01-30 13:27:25 -08:00
Seth Alves
95d5c64e83 put a schmitt trigger in place to de-bounce tablet clicks 2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242 allow tablet-stabbers to more easily click buttons 2017-01-26 14:54:32 -08:00
Seth Alves
f2ff6fd9e7 allow stylus to work when edit.js is running 2017-01-23 15:52:40 -08:00
Seth Alves
9d77e9937c only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base 2017-01-23 14:38:48 -08:00
Seth Alves
c958314918 merge from upstream 2017-01-23 13:52:01 -08:00
Dante Ruiz
d5427f8722 close tablet bug fix 2017-01-23 17:33:33 +00:00
humbletim
d20ac20ff2 move isInEditMode guard to setState 2017-01-23 01:31:11 -05:00
humbletim
15394056eb * add isInEditMode to utils.js 
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
 2017-01-20 22:29:40 -05:00
Dante Ruiz
5c55b86be6 fix bug 2017-01-21 01:56:06 +00:00
Seth Alves
87ea9161e4 avoid bad interaction between far-grab and equip 2017-01-20 14:49:49 -08:00
Seth Alves
7f25135633 try again on haptics from touching tablet overlay with stylus 2017-01-20 11:06:35 -08:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix 
Home button is now an overlay
 2017-01-20 10:32:31 -08:00
Seth Alves
caae804318 re-enable haptic pulse when stylus touches tablet overlay 2017-01-20 10:12:15 -08:00
Dante Ruiz
a319db3cb4 removed duplicate code 2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Anthony J. Thibault
2c3c96b600 Fix for broken entity scrolling introduced by 23ea65e2 
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
 2017-01-19 14:23:43 -08:00
Seth Alves
18e9b476c5 Merge pull request #9439 from hyperlogic/tablet-ui 
Improved stylus and laser input deadspot
 2017-01-19 12:43:02 -08:00
Seth Alves
41ddfbfd27 clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit 2017-01-19 11:34:38 -08:00
Anthony J. Thibault
2fd691d844 Improved stylus and laser input deadspot 2017-01-18 18:23:00 -08:00
Seth Alves
7c938728e5 don't do constant haptics if stylus touches tablet frame. home button triggers only once per click 2017-01-18 16:56:39 -08:00
Anthony J. Thibault
56c897cc2f Process the tablet stylus even when reticle is over 2d HUD overlay. 2017-01-18 15:36:09 -08:00
Anthony J. Thibault
fc5c2c8def Fix for glitchy scrolling 2017-01-18 15:32:38 -08:00
Anthony J. Thibault
28dac9d802 Lasers now interact with the tablet in edit mode. 2017-01-18 15:32:36 -08:00
Seth Alves
a8038ce64e cleanups 2017-01-18 10:50:02 -08:00
Seth Alves
1f92b57bf2 switch to model stylus 2017-01-18 10:46:18 -08:00
Seth Alves
89d7b8bfc6 call releaseEquip when an equipped entity is dropped with a secondary press 2017-01-17 13:27:01 -08:00
Seth Alves
5c205f5800 avoid an unhook loop if two different hands have passed something back and forth more than once 2017-01-17 10:24:30 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
Seth Alves
23ea65e2b5 more changes to handle camera-relative-controller joints. 2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114 put code to delete prim-stylus tip back in 2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00
Seth Alves
611a926894 if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet 2017-01-12 13:45:03 -08:00
Seth Alves
c93d83dadd update lasers when distance-scrolling a web entity/overlay 2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1 removed committed code 2017-01-10 23:26:37 +00:00
Dante Ruiz
d0baa0e303 home button works with the stylus 2017-01-10 14:51:46 -08:00
Seth Alves
0fc1abc068 remember previous parentID in the script and try to put it back when releasing 2017-01-10 13:00:49 -08:00
Seth Alves
bff9e9be38 put back code that replaces previous parentID on release 2017-01-10 09:22:36 -08:00
Seth Alves
61f0c56a36 remove code that remembers previous state in userData 2017-01-09 14:20:03 -08:00
Seth Alves
fa803aebe9 use /~/ style to reference includes 2017-01-09 10:21:07 -08:00
Seth Alves
195b92d05d lasers on webpage work again 2017-01-05 14:35:02 -08:00
Seth Alves
5e9c37777c Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers 2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b make showing of stylus be proximity based rather than raypick based 2017-01-05 12:49:50 -08:00
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
Seth Alves
a585d43a5e attempt to get laser-based web scrolling to work, again 2017-01-04 16:51:47 -08:00
Seth Alves
ed934c37ae put code that allows lasers vs web entities or overlays back in 2017-01-04 15:23:55 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Anthony Thibault
c201b6a7f9 Merge pull request #9256 from druiz17/moreButtons 
all hub button now on tablet
 2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
82ab8635d7 debugging 2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00 first cut at using wait signals to improve RPC timing 2016-12-30 09:13:21 -08:00
Dante Ruiz
61277c0605 Stylus now works in edit mode 2016-12-22 17:33:25 +00:00
Ryan Huffman
df0dfc761d Add ability to disable avatar and object scaling in handController grab 2016-12-20 18:01:53 -08:00
Stephen Birarda
ebd347fc15 only respect release of secondary for hold once pressed 2016-12-20 14:46:55 -08:00
Stephen Birarda
4fcccb5455 check for release of equip in this.nearGrabbing 2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16 return after release, duh 2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf always unequip on secondary release 2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc add special equip for oculus style grab 2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc removed initial delay for seek beams 2016-12-20 14:11:52 -08:00
Philip Rosedale
938734d3fc Grip controllers can grab objects, slight delay on search beam 2016-12-20 14:11:33 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Seth Alves
e5804dade0 get stylus working with web entities 2016-12-20 07:43:48 -08:00
Seth Alves
ae7af3e227 don't hide stylus so quickly 2016-12-20 07:43:48 -08:00
Seth Alves
e9c848bfe8 stylus for web overlays 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00