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

7408 commits

Author SHA1 Message Date
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Seth Alves
b2f25629eb don't allow scaling of others' equipped entities 2019-01-03 08:19:18 -08:00
Seth Alves
306c54c060 fix code that allows adjusting of own avatar entities while forbidding adjusting those of others 2019-01-03 08:17:52 -08:00
Seth Alves
bf46960dc3 fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities 2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
613f290226 don't attempt to grab other's avatar-entities 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557 get grabbing and scaling to get along better 2019-01-03 08:17:52 -08:00
Seth Alves
905af34564 disable traits-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c port over PR-14276 2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b port over PR-14429 2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece enable trait-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff port over PR-14464 2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c turn-off nearEntityGrab when scaleEntity is active 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
Ryan Huffman
f3d2d7c95b
Merge pull request #14638 from huffman/fix/entity-list-text-mb 
Fix texture MB column not sorting correctly in entity list
 2019-01-02 13:32:05 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk 
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
 2018-12-27 15:43:17 -08:00
Ryan Huffman
9c60b09c6b Fix texture MB column not sorting correctly in entity list 2018-12-27 14:50:12 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities
 2018-12-20 19:10:22 +00:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Wayne Chen
c36b3a4b07 fix 2018-12-19 12:46:41 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
sam gateau
d8e7305f4a Removing hili for now 2018-12-18 09:16:40 -08:00
Sam Gateau
76f204b5aa Exploring the hologram 2018-12-18 00:45:12 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Sam Gateau
318bf20ede Shadow is working correctly in both pipelines 2018-12-17 00:27:07 -08:00
Sam Gateau
30277213c6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-13 20:40:50 -08:00
sam gateau
94ae345daf Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-13 08:45:29 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
SamGondelman
770da220d7 cleanup entity properties more and start polyline work, remove lines 2018-12-12 16:47:35 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Sam Gateau
8599a340ed Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-11 19:02:48 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Jeff Clinton
e88e15fd94
Merge pull request #14560 from zfox23/MS4382_handshakeSparkles 
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
 2018-12-11 11:51:54 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00