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
60364 commits 29 branches 0 tags 1.1 GiB
Commit graph

4297 commits

Author SHA1 Message Date
druiz17
cea3c002dd improving far rotate 2017-09-27 11:47:26 -07:00
druiz17
38096b48d9 fixing entitySelectionTool 2017-09-27 10:52:56 -07:00
Seth Alves
eb6c99456d Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger 2017-09-27 10:01:24 -07:00
David Rowe
20b1ab0087 Tidying 2017-09-27 22:06:28 +13:00
David Rowe
ad838c6b3c Adjust position of wrist icon 2017-09-27 21:53:26 +13:00
David Rowe
c2471e340a Reduce number of calls to Script.resolvePath 2017-09-27 21:49:02 +13:00
David Rowe
e623b1e0a5 Alternative, more robust handle scaling method 2017-09-27 19:21:07 +13:00
Brad Hefta-Gaub
3500705d0c Merge pull request #11427 from ElderOrb/case7723 
7723 Tablet Should Rotate Faster when using Create app
 2017-09-26 22:05:45 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
David Rowe
d4fc26f3b7 Fix header highlighting if close and reeopen app with tool selected 2017-09-27 15:22:33 +13:00
David Rowe
895ffaf1f9 Fix group clear button messing up select-in-box state 2017-09-27 15:09:10 +13:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale 
Teleport.js: can now teleport small distances with small avatar scale
 2017-09-26 19:05:14 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Seth Alves
f384cde471 Merge pull request #11467 from sethalves/fix-near-trigger 
Fix near trigger
 2017-09-26 17:27:05 -07:00
Dante Ruiz
410baaf7bc Merge pull request #11464 from druiz17/controller-dispatacher-bugs 
fix auto dropping and re-grabbing loop
 2017-09-26 16:46:34 -07:00
Seth Alves
8180acbffc use same trigger test as in isReady 2017-09-26 16:29:22 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
David Rowe
76889d1b67 Improve handle scaling of entity with near-zero dimension 2017-09-27 12:04:05 +13:00
Seth Alves
a478506da3 Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger 2017-09-26 15:52:22 -07:00
Seth Alves
644532dd59 only send startNearTrigger once 2017-09-26 15:17:23 -07:00
druiz17
5a1242a1ac fix spelling error 2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c fix auto dropping 2017-09-26 14:52:01 -07:00
Anthony J. Thibault
a7cfb5d635 teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale 2017-09-26 14:21:25 -07:00
David Rowe
0f5adb488c Merge branch 'vr-edit-footer' into vr-edit-a 
# Conflicts:
#	scripts/vr-edit/modules/toolsMenu.js
 2017-09-27 10:04:31 +13:00
Anthony J. Thibault
c26d04dca1 Teleport.js: Fix message bugs, and made eslint clean 
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
 2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d Merge pull request #11430 from sethalves/fix-parent-grab 
Fix parent grab
 2017-09-26 13:00:16 -07:00
David Rowe
8bd0e464aa Merge branch 'vr-edit-group-box' into vr-edit-a 2017-09-27 08:48:44 +13:00
Seth Alves
81f74f9297 Merge pull request #11444 from druiz17/module-handcontrollerPointer 
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
 2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3 Merge pull request #11456 from druiz17/bugs-handControllerGrab 
Correctly grab tablet in 3rd person
 2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03 Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab 2017-09-26 11:08:40 -07:00
Seth Alves
737b583745 avoid unequipping things during a HMD snap-turn 2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151 fix cloning equiping 2017-09-26 10:37:36 -07:00
David Rowe
9b7197cf3f Don't highlight entity you're inside unless you laser it 2017-09-26 15:36:40 +13:00
Seth Alves
0b60928dd3 fix rollup-to-parent code to only roll up to entity parents 2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2 able to grab tablet in 3rd person 2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894 unmangle merge 2017-09-25 15:18:22 -07:00
David Rowe
d64e3aca55 Polyvoxels don't have a color property 2017-09-26 11:10:05 +13:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
ec40df711d fix tablet grabbing and eslint changes 2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0 fix mouse visiblity 2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45 merge from upstream 2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850 Merge pull request #11401 from druiz17/module-scale-entities 
ScaleEntity Module
 2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 09:09:58 -07:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
David Rowe
bbc6e5d1b5 Fix bounding box isn't cleared when exit tool with header or grip click 2017-09-24 17:06:42 +13:00
David Rowe
4e0efdaa1a Automatically add entities in bounding box to currently selected groups 2017-09-24 16:55:15 +13:00
David Rowe
2afc84cf0b Display bounding box of currently selected groups 2017-09-24 12:06:04 +13:00
David Rowe
8976befaeb Use emissive FBX model for highlighted Tools menu header 2017-09-23 14:20:53 +12:00
David Rowe
64acc0d0a3 Press undo/redo and menu buttons when click them 2017-09-23 13:01:38 +12:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394 fix scripting error 2017-09-22 17:13:48 -07:00
David Rowe
bc5cd7415b Use emissive FBX models for header bars 2017-09-23 11:56:42 +12:00
David Rowe
f53f8c14fc Update wrist tool icon 2017-09-23 11:34:57 +12:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9 undo unnessary changes 2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44 Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer 2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
David Rowe
edd6310a07 Move undo/redo buttons to footer area and make persistent 2017-09-22 21:46:33 +12:00
David Rowe
ca000acf2a Add space for a footer to put undo/redo buttons in 2017-09-22 17:40:34 +12:00
David Rowe
e0658c7a2f Merge branch 'master' into vr-edit-a 2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2 working on fix 2017-09-21 18:17:05 -07:00
David Rowe
959d497079 Change group tool's "Cancel" button to "Clear" 2017-09-22 12:00:12 +12:00
David Rowe
e4a126461b Add extra Create palette items 2017-09-22 10:53:06 +12:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
David Rowe
a757012c10 Change default color to 100% white 2017-09-22 08:17:35 +12:00
Seth Alves
fc3e259f6f remove debug prints 2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a back out bad change 2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9 oops 2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a merge from upstream 2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped 2017-09-21 11:07:47 -07:00
Seth Alves
61efaf7fc2 Merge pull request #11420 from druiz17/fix-parenting-overlay-module 
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
 2017-09-21 09:44:07 -07:00
druiz17
65e0c99618 small change 2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba fixing merge conflicts 2017-09-21 09:04:13 -07:00
beholder
8085d0292d 7723 Tablet Should Rotate Faster when using Create app 2017-09-21 16:26:54 +03:00
David Rowe
f58b2a3bed Add group selection logic 2017-09-21 21:59:19 +12:00
David Rowe
2f9a314aa9 Implement group selection box button states 2017-09-21 19:07:13 +12:00
David Rowe
a56a155cc3 Add group selection box buttons 2017-09-21 17:31:32 +12:00
David Rowe
906595e4fa Automatically return to Tools menu after grouping or ungrouping 2017-09-21 16:15:06 +12:00
David Rowe
c05ccd2ed5 Merge branch 'master' into vr-edit-a 2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae Merge pull request #11416 from druiz17/stylus-pos 
Pull back the stylus position in hand.
 2017-09-20 17:40:22 -07:00
druiz17
2c55419c60 change tablet forward offset 2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea Merge pull request #11408 from druiz17/fix-tablet-input 
fixing/improving and cleanup tablet inputs
 2017-09-20 16:36:07 -07:00
druiz17
949c343604 fixing nearGrabParentModule switching grabbed overlays 2017-09-20 15:34:01 -07:00
Cain Kilgore
a4655b9c73 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-20 23:25:26 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Thijs Wenker
7ea1968b33 Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=) 2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script 2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab move the stylus back a bit 2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5 fixed tablet grabbing issue 2017-09-20 14:10:10 -07:00
druiz17
2ce6dcf89d fixing spelling error 2017-09-20 11:45:42 -07:00
druiz17
5d87036f32 make changes requests and slight fixes 2017-09-20 11:41:31 -07:00
vladest
c17ca955db Listener disconnects in C++ now 2017-09-20 20:03:53 +02:00
Daniela
8144841258 Add Edit.js Entities spawn up according to the orientation of the avatar. 2017-09-20 09:21:16 -07:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
druiz17
e78d8bc132 tablet on wiki planet 2017-09-20 09:11:06 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -07:00
David Rowe
41647305ed Rename selection manager object to avoid name clash with new API object 2017-09-20 11:11:18 +12:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
druiz17
e2921661e9 scaling entities 2017-09-19 09:35:22 -07:00
David Rowe
c56fda88fa Merge branch 'master' into vr-edit-a 2017-09-19 16:17:04 +12:00
druiz17
9df3b6c211 change tablet spawn position 2017-09-18 13:29:05 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
095cd03ee2 Merge pull request #11380 from ctrlaltdavid/fix-controller-typos 
Fix typos in controller modules disabler
 2017-09-16 11:13:15 -07:00
Seth Alves
4fcbaf6f4d Merge pull request #11374 from sethalves/fix-grab-entity-methods 
fix grab entity methods + jshint cleanups
 2017-09-16 11:11:13 -07:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
David Rowe
e788f691c4 Merge branch 'master' into vr-edit-a 2017-09-16 15:59:08 +12:00
David Rowe
6c5a1c0460 Address laser and controller interactions with HUD overlays and tablet 2017-09-16 15:45:44 +12:00
David Rowe
18b71f0c0f Fix typos in controller modules disabler 2017-09-16 15:34:53 +12:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
0816a8af27 fix grab entity methods 2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa fix grab entity methods 2017-09-15 12:05:49 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
df80b7ecfa stopNearTrigger, not end 2017-09-15 11:16:54 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
David Rowe
455db1ac82 Tighten up handle scaling to keep handle 1-1 with hand/laser 2017-09-15 19:11:04 +12:00
Cain Kilgore
794f3ca69f Indentation 2017-09-15 06:09:03 +01:00
Cain Kilgore
e86b37f949 Added script for testing 2017-09-15 06:07:50 +01:00
David Rowe
1f63425e9f Don't kick particle effects when apply physics 2017-09-15 13:58:58 +12:00
David Rowe
4b63d8b7d9 Don't kick polylines when apply physics 2017-09-15 13:48:01 +12:00
David Rowe
f02d057a83 Fix not kicking off physics if hand is inside entity 2017-09-15 13:43:53 +12:00
Anthony J. Thibault
f534ee5ad9 laser offset fix 2017-09-14 16:37:45 -07:00
David Rowe
9da3ed0ceb Emissive Create palette models 2017-09-15 11:24:33 +12:00
David Rowe
b0c951a2c4 Merge branch 'master' into vr-edit-a 2017-09-15 11:09:39 +12:00
David Rowe
c6af82dedc Increase maximum number of undo levels to 1000 2017-09-15 09:55:14 +12:00
David Rowe
f1572a165a Fix history crash 2017-09-15 09:54:55 +12:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
David Rowe
378793d18e Proper color circle 2017-09-15 08:48:47 +12:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1 IPD Fixes for controllerDispatcher and controllerModules 2017-09-14 10:36:05 -07:00
David Rowe
f22e2de525 Interim method for disabling controllerDispatcher lasers, grabbing, etc. 2017-09-14 17:21:45 +12:00
David Rowe
299a8078e3 Revert handControllerGrab.js related changes 2017-09-14 17:08:26 +12:00
Anthony J. Thibault
9a9f4a0d24 Fix controllerModules with appropriate IPD scale changes 2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
David Rowe
a4ecb69ea6 Merge branch 'master' into vr-edit-a 2017-09-14 12:26:20 +12:00
David Rowe
8e25ccac79 Tidying 2017-09-14 12:20:33 +12:00