Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 09:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66293 commits 76 branches 59 tags 1.2 GiB
Commit graph

4201 commits

Author SHA1 Message Date
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour 
Trigger Avatar Recenter Behaviour
 2018-04-02 14:42:21 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller 
Updating char controller
 2018-04-02 13:24:15 -07:00
amantley
3f44b88d2d added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class 2018-03-29 10:09:51 -07:00
amantley
90d87c5b5d changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety 2018-03-28 14:00:36 -07:00
amantley
4b1f974561 fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h 2018-03-28 11:57:48 -07:00
amantley
95f1d0e4fa added get and set functions for the activate recenter variables 2018-03-28 10:33:00 -07:00
amantley
9f3b82a417 added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly 2018-03-27 18:21:14 -07:00
Dante Ruiz
f36a916fb6 revert comment change 2018-03-22 17:44:17 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Dante Ruiz
00fa5cfd06 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-13 10:08:00 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Alexia Mandeville
748507f1e3 Increasing speed on mousescroll - zooming in/out of avatar 2018-03-10 22:20:00 -08:00
Alexia Mandeville
2598be16f8 Updating default mouse pitch/yaw input to be more stabilized 2018-03-10 21:46:20 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Dante Ruiz
c949b44f0c conforming to coding standards 2018-03-09 10:42:19 -08:00
Dante Ruiz
cfa85b5137 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-09 09:37:08 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
d1b87b3116 Added missing avatar shadows. 2018-03-08 12:14:42 -08:00
Dante Ruiz
297273de08 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-07 13:09:47 -08:00
Dante Ruiz
a70509233e making small changes 2018-03-07 08:25:27 -08:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13:00
Thijs Wenker
866bec0b34 rule -> role 2018-03-07 02:36:07 +01:00
Dante Ruiz
69af12fbc7 chaning speeds 2018-03-06 15:47:01 -08:00
Dante Ruiz
fe363e7f2a changing keybaord mapping 2018-03-06 14:16:25 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors 
Add dynamic mode for scripted avatar motor
 2018-02-26 11:03:30 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
David Back
283b5724ba CR changes 2018-02-23 15:02:51 -08:00
David Back
da391564a8 CR changes 2018-02-23 15:01:29 -08:00
David Back
a418129bea simplify to just changing timescales 2018-02-23 15:00:23 -08:00
David Back
083e461eb0 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-22 17:20:49 -08:00
David Back
902672f85e add dynamic mode for scripted avatar motor 2018-02-22 17:20:36 -08:00
Nissim Hadar
bf4ba07b72 Added parameters to canCastShadow - still sucks. 2018-02-21 12:36:34 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue 
Introducing group culling to avoid the avatar model to be partially culled
 2018-02-14 15:38:52 -08:00
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -08:00
Dante Ruiz
45f09dde96 address tony's requests 2018-02-13 10:32:15 -08:00
Dante Ruiz
1a25332575 fix indenting 2018-02-12 10:59:25 -08:00
Dante Ruiz
3c84318918 fixing merge conflict 2018-02-12 10:57:55 -08:00
Dante Ruiz
d381beb213 cleaning up code 2018-02-12 10:53:42 -08:00
Dante Ruiz
5325b22b01 working on lambdas 2018-02-09 16:46:11 -08:00
Dante Ruiz
b3a3d92131 Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-09 10:31:43 -08:00
Dante Ruiz
beb41495d5 save avatarUrl when setting new skeletonModelUrl 2018-02-09 09:35:24 -08:00
Seth Alves
3e913cfcfe AvatarActionHold has positional and rotational targets 2018-02-07 10:45:13 -08:00
Dante Ruiz
e87067f93d fix variable naming and edge case 2018-02-05 15:31:37 -08:00