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

443 commits

Author SHA1 Message Date
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police 
Case 19409, Case 19468: Fading fixes and shader cleanup
 2018-11-13 15:00:23 -08:00
Jamil Akram
6511b60aa4
Merge pull request #14264 from ctrlaltdavid/M19085 
Fix AvatarManager.getPalData() returning data for just a single avatar
 2018-11-12 12:27:58 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
luiscuenca
f9b6d3dc6f Merge addTransitAPI branch 2018-11-05 19:02:35 -07:00
luiscuenca
e49e9cdc56 Set avatar client sooner 2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
David Rowe
e879c5a32d Merge branch 'master' into M19085 
# Conflicts:
#	interface/src/avatar/AvatarManager.h
 2018-10-24 12:16:38 +13:00
luiscuenca
fa67e1b269 Remove logs and magic numbers 2018-10-23 11:51:15 -07:00
luiscuenca
afc76fec72 Added overrideNetworkAnimation and restoreNetworkAnimation methods 2018-10-22 15:20:32 -07:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -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
luiscuenca
bb5c042f16 Blend network animation 2018-10-18 17:51:20 -07:00
luiscuenca
078baa86e4 Sitting abort post transit animation 2018-10-16 13:16:01 -07:00
luiscuenca
7da5fa9ea7 Transit animations won't play, they just get sent over the network 2018-10-16 11:33:58 -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
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -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
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
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -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
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
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Anthony Thibault
58df72af60 Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast 2018-09-28 16:32:12 -07:00
luiscuenca
bbe836ee88 Remove smooth teleport and set/get API methods 2018-09-27 10:38:45 -07:00
John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 
fix MyAvatar-vs-OtherAvatar collisions
 2018-09-26 15:21:18 -07:00
luiscuenca
af2935187b Fix warnings 2018-09-25 08:32:43 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
Andrew Meadows
a3f946dee1 activate OtherAvarar in physics sim on position change 2018-09-24 16:27:37 -07:00
Andrew Meadows
c1d65f5118 update avatar shape after it loads 2018-09-24 12:07:08 -07:00
Anthony Thibault
b467267e40 Fix for bad static_pointer_cast on exit. 
Identified by Address Sanatizer on Linux.

On exit ~Applicaiton calls AvatarManager::deleteAllAvatars.  This iterates over all avatars remaining in the _avatarHash.
Typically this includes the MyAvatar instance.  In this case the previous code would attempt to static cast an AvatarData pointer to an instance
of OtherAvatar.  This might be harmless, but could also lead hard to diagnose issues such as memory corruption.
 2018-09-24 11:47:05 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d fix bad lock, optimize some operations, clarify comment 2018-09-24 11:27:20 -07:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
Stephen Birarda
3a7785d10f fix for deadlock in other avatar entity removal 2018-09-18 17:52:24 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00