Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
71774 commits 29 branches 0 tags 1.1 GiB
Commit graph

71774 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod 
Enable LOD manager on android
 2018-09-08 13:43:36 -07:00
David Back
3601ade8ba destroy thread from thread finished not scriptEngine destroyed 2018-09-07 18:36:36 -07:00
Simon Walton
6bb143da42 Make maxAvatarBytesPerFrame int rather than float; other clean-up 2018-09-07 18:14:39 -07:00
Anthony Thibault
ff645be78b Update animations for jump, inAir and less feminine walk cycle 2018-09-07 17:09:55 -07:00
Sam Gateau
5140999445 Forcing all the meshes with 3 buffers aka the blendshape layout 2018-09-07 15:57:04 -07:00
Simon Walton
c2fe2b60b3 Use std::vector for ignored avatars since the list will be small 2018-09-07 15:49:47 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check 
Check that a requested listening port is able to be used
 2018-09-07 15:48:12 -07:00
John Conklin II
01cace694f
Merge pull request #13916 from birarda/bug/ignore-freeze-master 
send ignoring avatar removal to ignored avatar
 2018-09-07 15:40:32 -07:00
sam gateau
e8cfac2ab1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e removing performance counters 2018-09-07 15:35:10 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Stephen Birarda
be57789ad8
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup 
Remove some debug logging left in the safe landing module
 2018-09-07 14:58:00 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats 
Move animation stats into its own Menu
 2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom 
Fix bloom on edges
 2018-09-07 14:50:31 -07:00
Anthony Thibault
949efff439 Fix blendshapes playing back in recordings at 2x their proper values 2018-09-07 13:21:17 -07:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Wayne Chen
695f6a8f16 Merging changes, modifying close button 2018-09-07 12:05:28 -07:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
Sam Gateau
81a542982b Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-07 12:02:20 -07:00
luiscuenca
02065518cb Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip 2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
John Conklin II
e578b047b0
Merge pull request #13838 from danteruiz/fix-hmd-debug-window 
fixing scripting window visiblity and size issues
 2018-09-07 11:47:44 -07:00
SamGondelman
32e2a244a1 detailed profile range for avatar unpacking 2018-09-07 11:44:35 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot 
Fix for lurching walk(case 16945), when walking in hmd.
 2018-09-07 11:43:03 -07:00
Wayne Chen
39041f2942 fixing username field 2018-09-07 11:36:21 -07:00
Wayne Chen
44d36ec622 wallet should save username when checked 2018-09-07 11:31:36 -07:00
Simon Walton
1a67176819 Fix a dangling merge conflict 2018-09-07 11:29:30 -07:00
Wayne Chen
db96603cda removing some unused properties 2018-09-07 11:23:58 -07:00
Wayne Chen
d9495275cc adding cancel button and signed in checkbox 2018-09-07 11:22:31 -07:00
sam gateau
fa72910ac1 fixing fuckeries 2018-09-07 11:14:12 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
Wayne Chen
fc4c728181 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-07 10:11:34 -07:00
sam gateau
d979d02139 why did i do that? 2018-09-07 10:03:55 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod 2018-09-07 10:01:26 -07:00
Simon Walton
3dc993c841 Fix small error in translation delta 2018-09-07 09:46:21 -07:00
Anthony Thibault
5a059e9318 Fix for build failure on linux and android. 2018-09-07 09:44:19 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
Zach Fox
d8c30ff769
Merge pull request #13955 from zfox23/MS17877_connectionsSort 
Fix MS17877: Persist Connections table sort choice
 2018-09-07 09:17:15 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
Wayne Chen
e1541fd7e0 Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-07 08:43:42 -07:00
Alexander Ivash
7058b07aea FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized 2018-09-07 12:41:39 +03:00
Alexia Mandeville
190a335c71
Adding more margin to forgotten links 2018-09-07 00:01:00 -07:00
Alexia Mandeville
92f218ae29
Adding margins to forgotten link text 2018-09-06 22:59:19 -07:00
Alexia Mandeville
2443723a2b
Removing margins, adding width attribute 2018-09-06 21:14:04 -07:00
Simon Walton
22cfad2483 Squelch (false) warning from gcc 2018-09-06 18:32:37 -07:00
Anthony Thibault
6508533a15 Remove anim stats from plain ole stats. 
There are still present in anim stats tho.
 2018-09-06 17:58:40 -07:00
Wayne Chen
45b2098346 Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:58:04 -07:00
Dante Ruiz
45a99a9244 fixing some bugs 2018-09-06 17:55:10 -07:00