Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73483 commits 75 branches 59 tags 1.2 GiB
Commit graph

22481 commits

Author SHA1 Message Date
Zach Fox
1d8994993c Whitelist TTS scripting interface to TTS app, which is now a default script 2018-10-22 17:05:31 -07:00
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item 2018-10-22 15:39:23 -07:00
luiscuenca
afc76fec72 Added overrideNetworkAnimation and restoreNetworkAnimation methods 2018-10-22 15:20:32 -07:00
Zach Fox
1023e6d2b9 Fix ClipboardScriptingInterface: 2018-10-22 14:00:04 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
John Conklin II
bd480bab80
Merge pull request #14226 from Atlante45/fix/octree-scene-stats 
Only track stats for compatible packets
 2018-10-22 11:45:16 -07:00
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
NissimHadar
c9f9679cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into addNoLogin 2018-10-22 10:55:56 -07:00
NissimHadar
092f88e558 Change parameter name from --no-login to --no-login-suggestion 2018-10-22 10:55:50 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder 
Fix crash with BandwidthRecorder
 2018-10-22 10:11:26 -07:00
amantley
eb3db9a571 added default to case statement 2018-10-20 16:13:41 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation 2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f Hold flickering fixed and refactor 2018-10-20 15:22:25 -07:00
amantley
e693275b10 Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-20 13:42:23 -07:00
amantley
5efb889de5 removed unused variables 2018-10-20 13:42:17 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix 2018-10-20 13:39:55 -07:00
Brad Hefta-Gaub
23ddb7dea6
Merge pull request #14207 from Atlante45/fix/white-spheres 
Remove pending avatars data structure
 2018-10-20 12:09:51 -07:00
amantley
a427ddb235 removed extraneous print statements 2018-10-20 09:16:05 -07:00
amantley
070a517423 changed the recenterModel variables to userRecenterModel 2018-10-19 18:07:03 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
Brad Hefta-Gaub
c6fff83805
Merge pull request #14145 from ctrlaltdavid/M17223 
JSDoc fixes
 2018-10-19 16:16:19 -07:00
amantley
a43985ef64 combo box for recenter model is added 2018-10-19 16:03:53 -07:00
Brad Hefta-Gaub
acc6d3e45c
Merge pull request #14144 from ctrlaltdavid/M17222 
Fix and fill in JSDoc for MyAvatar flying-related functions
 2018-10-19 15:57:04 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest 
Disable user hand controllers if they are too far away or not moving.
 2018-10-19 14:02:32 -07:00
Anthony Thibault
ef74014075 Small avatars now have a minimum jump height of 0.25 meters 
This should improve the quality of the jump animation and improve the mobility of small avatars.
 2018-10-19 13:55:56 -07:00
John Conklin II
81fbb5a332
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab 
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
 2018-10-19 10:33:14 -07:00
Zach Fox
2df9d28c5b Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-19 09:42:06 -07:00
amantley
0837f790eb combo box changes 2018-10-19 07:46:16 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth 
Clean up elbow smoothing code
 2018-10-18 19:16:32 -07:00
John Conklin II
7c4733a31d
Merge pull request #14053 from ElderOrb/FB17835 
make extracted from resources avatarbookmarks.json writable
 2018-10-18 18:29:02 -07:00
luiscuenca
bb5c042f16 Blend network animation 2018-10-18 17:51:20 -07:00
John Conklin II
18df79a8a6
Merge pull request #14211 from amantley/crazylegs 
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
 2018-10-18 17:48:26 -07:00
NissimHadar
12d092609b Do not show login dialog if requested not to on the command line. 2018-10-18 17:20:26 -07:00
Anthony Thibault
3e68a1d5a5 Merge branch 'master' into feature/acceleration-limit-filter 2018-10-18 16:51:57 -07:00
amantley
b9a2f19d30 made all the suggested corrections except the dropdown qml. 2018-10-18 16:39:50 -07:00
Zach Fox
41742aaf9e Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 16:22:41 -07:00
John Conklin II
40a48777dc
Merge pull request #14231 from ctrlaltdavid/M16205a 
Fix lasers going through tablet to drawInFrontOverlays
 2018-10-18 15:36:29 -07:00
David Rowe
9b4c5e1685 Fix OSX/Linux warnings 2018-10-19 08:20:21 +13:00
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -07:00
amantley
12b03b0e07 tinkering with lerping the spine2 position in avatar space 2018-10-18 10:52:13 -07:00
Andrew Meadows
1a685d2409 set script-triggerd sim ownership priority correctly 2018-10-18 10:33:02 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -07:00
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3 
Replace vec2, vec3, and xColor properties with JS prototypes
 2018-10-18 09:47:56 -07:00
amantley
8f4fafe4d0 put some smoothing on the spine2 rotation in myskeletonmodel.cpp 2018-10-18 08:44:01 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
David Rowe
e339f966d9 Remove reference to a function no longer in the API 
Noticed in passing.
 2018-10-18 17:11:48 +13:00
David Rowe
1610d79023 Remove now redundant mouse pointer code that tried to do the same thing 2018-10-18 17:11:26 +13:00
David Rowe
c41ce5d484 Make tablet have priority over drawInFront overlays rendered behind it 2018-10-18 17:10:48 +13:00
amantley
83ec346cc5 changed the hand azimuth computation to be in spine2 space. this stops you from having a reversed direction when you sit down with hmd lean off and the hands are behind the origin in the z direction. 2018-10-17 16:42:29 -07:00
John Conklin II
8e5bc1678f
Merge pull request #14219 from SamGondelman/materialCull 
QueryAACube fixes and materials expand to include their parent
 2018-10-17 15:15:23 -07:00
Clement
a7855dcf70 Only track stats for compatible packets 2018-10-17 15:13:29 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
amantley
cd7af8b605 changed the name of sumuserheightsensorspace to averageuserheightSensorSpace 2018-10-17 08:51:40 -07:00
amantley
baeccebfb9 changed the transition times to make the sit longer and the stand shorter 2018-10-16 17:45:55 -07:00
Zach Fox
26e388b139 Some experimentation yields promising results... 2018-10-16 17:34:48 -07:00
Anthony Thibault
27c495406e Disable user hand controllers if they are too far away or not moving. 2018-10-16 17:24:47 -07:00
amantley
02f499e9f7 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-16 16:56:10 -07:00
amantley
1764531822 removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr 2018-10-16 16:31:55 -07:00
amantley
cf7dc49499 removed a commment and changed the sanity check to be a const instead of a magic number 2018-10-16 16:04:31 -07:00
amantley
952b112271 changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing. 2018-10-16 15:10:26 -07:00
SamGondelman
49b496046b queryAACube fixes 2018-10-16 14:35:39 -07:00
luiscuenca
078baa86e4 Sitting abort post transit animation 2018-10-16 13:16:01 -07:00
David Rowe
353938193e Add return value 2018-10-17 08:03:56 +13:00
SamGondelman
ded8d4b547 variant conversions 2018-10-16 11:55:28 -07:00
luiscuenca
7da5fa9ea7 Transit animations won't play, they just get sent over the network 2018-10-16 11:33:58 -07:00
amantley
7d7fe8c089 removed some cruft 2018-10-15 18:12:27 -07:00
amantley
49b869c5e3 got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state 2018-10-15 18:02:50 -07:00
amantley
9ec999e15e added condition for start up in oculus that gets the correct starting height 2018-10-15 16:43:03 -07:00
Anthony Thibault
640ed6a32a Added "Developer > Avatar > Show Tracked Objects" menu 2018-10-15 12:42:07 -07:00
amantley
ae3ae9ce9a put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again. 2018-10-15 09:52:34 -07:00
amantley
8e272d6dd2 added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account 2018-10-15 08:43:25 -07:00
luiscuenca
ad09007bd8 Fix flickering holded entity, renames and refactors 2018-10-13 16:32:51 -07:00
Clement
3bfc5011f5 Remove _pendingAvatars struct 2018-10-12 17:57:48 -07:00
amantley
05d3becd40 changed cg hips computation so that it is not computed when hmdleanrecenter is turned off 2018-10-12 17:03:34 -07:00
amantley
90c9e578c8 when you unlock the transitions you now start in stand state 2018-10-12 16:47:53 -07:00
amantley
ee830cdcb0 cleaned white space 2018-10-12 16:05:31 -07:00
amantley
7dd156ccdd made the threshold for the spine angle larger to make auto transitions more robust 2018-10-12 15:00:15 -07:00
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -07:00
Zach Fox
53226e7924 Prevent overflows; still not working 2018-10-12 11:19:52 -07:00
David Rowe
2bd5605d8c Fix AvatarManager.getPalData() returning data for just a single avatar 
And fix up JSDoc.
 2018-10-12 17:32:27 +13:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -07:00
Zach Fox
daeedc6ef1 Lots of progress today 2018-10-11 17:10:14 -07:00
Clement
1bcbda7ad6 Prevent race on internal client traits members 2018-10-11 16:16:24 -07:00
amantley
f73d974ad7 added a lock state so you can lock sit or stand state, also made the 
hand azimuth relative to the spine2 location in avatar space. This stops
the arms from behaving badly when the hands are in front of the chest
but behind the root position of the avatar
 2018-10-11 15:14:33 -07:00
luiscuenca
de1b6e717f Cancel animation on chained trasits 2018-10-11 11:35:56 -07:00
luiscuenca
2f10327ad3 Fix last anim value 2018-10-11 10:57:39 -07:00
luiscuenca
1adac78828 fix errors and set new anim parameters 2018-10-11 10:45:35 -07:00
amantley
5faf26abd1 turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions 2018-10-11 10:38:59 -07:00
Anthony Thibault
a3a87ef48b Debug rendering of tracked objects, remove filters from body. 2018-10-10 17:52:26 -07:00
Zach Fox
5d4de3d3b0 I love it. 2018-10-10 17:36:38 -07:00
Zach Fox
d8c9712dd2 It's working! 2018-10-10 16:19:11 -07:00
Zach Fox
f1446532d0 Almost working 2018-10-10 16:13:23 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Anthony Thibault
0283c9fbdc Added CriticallyDampedSpringPoseHelper to help smooth out hips. 2018-10-09 10:51:02 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
unknown
3c25e6d5a8 Increase the linear velocity step when the avatar is small to avoid freezing 2018-10-08 14:40:54 -07:00
Alexander Ivash
19c3f1516f relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables 2018-10-09 00:17:19 +03:00
Clement
3eb7c80af3 Fix BandwidthRecorder storage concurrent accesses 2018-10-08 13:45:34 -07:00
unknown
1172e29d95 Clean up elbow smoothing code 2018-10-08 13:21:47 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
amantley
3517905435 added getter and setter for sitstandstatechange bool 2018-10-05 16:22:30 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
amantley
96872f8412 moved all the state update for sit and stand to myavatar::update() also 
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
 2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
amantley
ad46b71966 before moving the step state counting to myavatar::update() 2018-10-05 13:04:14 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
David Rowe
2ba8dc37d0 Miscellanous JSDoc fixes for issues noticed in passing 2018-10-05 16:57:29 +13:00
David Rowe
539c280281 Fill in missing JSDoc stubs in AvatarList and AvatarManager 2018-10-05 15:13:13 +13:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -07:00
amantley
cbe638bfdb added flag for vertical recentering that is state change, snap, versus 
the usual .5 second recentering
 2018-10-04 18:17:27 -07:00
David Rowe
ea8e02a84a Fix and fill in JSDoc for MyAvatar flying-related functions 2018-10-05 14:05:33 +13:00
amantley
635300c6d5 changed pre physics to use cg for desired body when in cg mode 2018-10-04 18:05:05 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Dante Ruiz
2a3b4a85c7 debugging 2018-10-04 15:57:05 -07:00
amantley
82f8c67436 put the mode in sensor space for cg 2018-10-04 15:37:01 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
amantley
acce675efc added snap for recentering with sit stand state change. using average height with tipping point for thresholds 2018-10-04 14:53:51 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix 
Fix avatars transit on domain enter
 2018-10-04 13:08:59 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
c785efec84 removing extraneous bool 2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
amantley
809ca0e512 vive hmd input is implemented. not using mode 2018-10-03 18:05:30 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
Dante Ruiz
b46d2319b1 fix spelling error 2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4 reverting logic change 2018-10-03 15:13:42 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Dante Ruiz
b28c375ad3 better loading check logic 2018-10-03 09:57:32 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
amantley
8a0fbc3fe9 changed the height to use the mode . to do fix sensor space bug. 2018-10-02 17:47:56 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates 2018-10-02 16:43:08 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace 
Better deadlock crash
 2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup 
Android signup
 2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast 
Fix for bad static_pointer_cast on exit.
 2018-10-02 11:31:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Gabriel Calero
13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00