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

50 commits

Author SHA1 Message Date
Dante Ruiz
a6eab29b14 fixing edge case 2018-05-03 13:09:45 -07:00
David Back
d1bb11562b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 09:36:19 -07:00
David Back
4a37c4ba18 add entityIsEquipped utils for grab.js check 2018-04-18 15:00:10 -07:00
Dante Ruiz
08ea72d71f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-13 15:39:14 -07:00
David Back
76c7ec69ce Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-13 14:28:14 -07:00
David Back
243b3637c4 fix grab.js change 2018-04-12 12:41:36 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
Dante Ruiz
cdc248129c fix grab.js 2018-04-11 14:25:06 -07:00
David Back
59971869f5 desktop equip 2018-04-10 19:06:27 -07:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
luiscuenca
53e1c57e3b Make lasers scale with avatar 2017-12-15 13:46:15 -07:00
Dante Ruiz
6173c33b51 fixing merge conflict 2017-11-13 15:02:25 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
Dante Ruiz
ef55e3181d moveing controllerDispatchaer pointers to pointerUtils.js 2017-11-09 16:48:52 -08:00
David Rowe
60319e8d53 Don't move or rotate entities if Alt or Meta keys are pressed 2017-11-07 13:35:31 +13:00
Dante Ruiz
b6e3262164 removing the last remaining laserPointers 2017-11-02 11:31:13 -07:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
druiz17
013e15c9a2 made requested changes 2017-10-10 10:54:56 -07:00
druiz17
a179df29fb mouse grab non-dynamic entities 2017-10-10 10:31:40 -07:00
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Seth Alves
d917878638 fix whitespace 2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8 don't do a lot of processing during the mouse-move event handler 2017-07-05 11:27:13 -07:00
Seth Alves
aeaa95b7a0 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-04-26 10:23:27 -07:00
Seth Alves
37233b9fdb avoid a rare script-crash 2017-04-26 10:19:50 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
ZappoMan
6400bb6319 CR feedback 2017-03-02 14:34:14 -08:00
ZappoMan
9e71801ae1 remove properties from RayToEntityIntersectionResult 2017-03-01 18:21:04 -08:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Seth Alves
c958314918 merge from upstream 2017-01-23 13:52:01 -08: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
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
Philip Rosedale
c60b0c7ef5 Fix indents 2016-12-01 12:54:38 -08:00
Philip Rosedale
c1e044364f Added distance attentuation of linear and angular rate 2016-11-22 10:24:02 -08:00
Andrew Meadows
fefe5e30ec don't use globals and remove double definitions 2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Seth Alves
b4df7cada7 don't mouse-grab things through an overlay 2016-05-18 16:16:31 -07:00
Seth Alves
ec554c3c0b Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-01 17:28:20 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
Renamed from scripts/default/controllers/grab.js (Browse further)