Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 05:59:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76693 commits 21 branches 0 tags 1.2 GiB
Commit graph

76693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection 
[MS#21495] Enable Bubble/Shield on Away
 2019-03-01 11:17:48 -08:00
Anthony Thibault
82b2050229 code review feedback 2019-03-01 11:13:56 -08:00
amer cerkic
ad69611b7c removing redef of the two functions in avatar.h 2019-03-01 11:08:00 -08:00
SamGondelman
cfb84967d5 these seemed dangerous 2019-03-01 10:54:44 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
amer cerkic
3e3176d3a4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-03-01 10:23:30 -08:00
Simon Walton
d391d4af38 Debugging + tweaks 2019-03-01 10:08:22 -08:00
NissimHadar
8bd9fed93e Merge branch 'master' of github.com:highfidelity/hifi into 21482-addSSIMResultsImage 2019-03-01 10:05:20 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload 
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
 2019-03-01 09:35:01 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities 
Case 21494: Avoid mem leaked entities
 2019-03-01 09:34:20 -08:00
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload 
Case 21490: Fix lasers and keyboard on reload
 2019-03-01 09:31:56 -08:00
Shannon Romano
b5693b8364
Merge pull request #15063 from SamGondelman/chat 
Case 21496: Fix chat.js textSize
 2019-03-01 09:31:15 -08:00
NissimHadar
d4fa1e25fb Working. 2019-02-28 20:33:21 -08:00
Simon Walton
64a2025bcd Renaming in main loop to make source/destination clear 
Also comment clean-up, etc
 2019-02-28 18:40:53 -08:00
danteruiz
7bcf727a83 review changes 2019-02-28 18:11:51 -08:00
Anthony Thibault
9a2bd87278 Fix for case when animated joints are missing from the target avatar skeleton 
By copying the animation rotations over to the target avatar in absolute frame, rather then relative,
we can properly "combine" animated rotations that aren't in the target avatar skeleton.
 2019-02-28 18:02:07 -08:00
Clement
991bcfe2b2 Remove dead code 2019-02-28 18:00:21 -08:00
Simon Walton
5a8ecdffab EntityStats can have embedded EntityData 2019-02-28 17:37:56 -08:00
danteruiz
9fe0309ae6 another login fix 2019-02-28 17:11:48 -08:00
Shannon Romano
650fb41681
Merge pull request #15053 from SamGondelman/i 
Case 21486: Fix context overlay
 2019-02-28 17:06:02 -08:00
SamGondelman
b26b02fed6 potential 2d overlay threading fixes 2019-02-28 17:02:08 -08:00
Clement
a804d3532e Set default limit for other nodes to size_t max 2019-02-28 15:30:57 -08:00
SamGondelman
8d5a3debfa fix chat.js textSize 2019-02-28 15:28:18 -08:00
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00
Clement
9ea41f7122 CR 2019-02-28 15:22:07 -08:00
r3tk0n
1476251dcb Enable bubble on AFK, respect user setting upon return from AFK. 2019-02-28 15:21:24 -08:00
Atlante45
9fe7a3350c Fix windows compile error 2019-02-28 15:06:26 -08:00
Thijs Wenker
ff8cb27256 include fst URL in the GeometryExtra hash 2019-02-28 23:45:08 +01:00
Andrew Meadows
8a7853a701 remove crufty comment 2019-02-28 14:38:13 -08:00
Roxanne Skelly
c721d68ec3 Remove unneeded cruft 2019-02-28 14:35:29 -08:00
Thijs Wenker
6aede024f4 use fst mapping path as reference instead of model path 2019-02-28 23:22:55 +01:00
Andrew Meadows
33d6e2ce3b avoid mem-leaked entities when clearing tree 2019-02-28 14:21:35 -08:00
Andrew Meadows
ed9ebf84c9 remove unuseful log entry 2019-02-28 14:21:14 -08:00
Andrew Meadows
7d9efe4c09 avoid mem-leak for serverless domains 2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097 fix lasers and keyboard on reload 2019-02-28 14:04:22 -08:00
Roxanne Skelly
c7b04865ce Remove debugging code, some thread safety changes 2019-02-28 13:58:33 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
amer cerkic
cda9bce293 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-02-28 12:36:00 -08:00
Shannon Romano
0f0ed0fbc4
Merge pull request #15007 from Atlante45/fix/kick-bug-master 
Case 21402: Don't send a KillAvatar packet on kick
 2019-02-28 12:26:30 -08:00
Roxanne Skelly
1e1437aab7 Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress 2019-02-28 12:13:17 -08:00
John Conklin II
c2679209ed
Merge pull request #15026 from SimonWalton-HiFi/hero-avatar-zone-79 
Avatar priority (hero) zones
 2019-02-28 11:45:53 -08:00
NissimHadar
15989e3a89 WIP. 2019-02-28 11:43:16 -08:00
raveenajain
c1516df58d transforms using joints 2019-02-28 11:35:29 -08:00
SamGondelman
a8e6d01279 fix context overlay 2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
amer cerkic
36cd26b190 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-02-28 10:18:04 -08:00
Sam Gateau
22b18c0c3d
Merge pull request #15047 from amerhifi/quest-demo 
case 21477: Execute command line args for Quest testing, profiling, etc
 2019-02-28 09:44:45 -08:00