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

19846 commits

Author SHA1 Message Date
Seth Alves
d5f5192954 Merge pull request #10174 from vladest/fix-snapshot-login-cancel 
Check if dialog was opened from StackView and then pop or just go to …
 2017-04-11 07:07:29 -07:00
Seth Alves
bf16309917 Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 
avoid invisible avatars redux
 2017-04-11 07:07:03 -07:00
Chris Collins
d8581c1026 Merge pull request #10176 from vladest/snaps_hover 
Added hover to Snaps and Places
 2017-04-10 16:09:43 -07:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00
Howard Stearns
99ba07dcb2 Merge pull request #10181 from davidkelly/dk/infoButtonFix 
re-enable the info button for user images on nearby tab
 2017-04-10 13:27:33 -07:00
Seth Alves
05bf1930ca Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame 
Added accessor to get Avatar default pose in avatar space
 2017-04-10 12:55:02 -07:00
Howard Stearns
8682df6bb7 Merge pull request #10154 from davidkelly/dk/3995 
updated connection instructions
 2017-04-10 12:43:20 -07:00
David Kelly
5fc4bbc260 re-enable the info button for user images on nearby tab 2017-04-10 12:26:34 -07:00
Andrew Meadows
e20fcca959 Merge pull request #10179 from jherico/avatar_rendering 
Creating new avatar rendering library, prepping for crowd rendering project
 2017-04-10 11:29:08 -07:00
David Kelly
082d0964d2 oops 2017-04-10 11:08:45 -07:00
Bradley Austin Davis
0ca0874c52 Creating new avatar rendering library, prepping for crowd rendering project 2017-04-10 10:55:04 -07:00
David Kelly
cd55728490 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036 2017-04-10 10:09:27 -07:00
David Kelly
46b6903b93 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi
393b24452d Added hover to Snaps and Places 2017-04-10 17:07:59 +02:00
David Kelly
3ea6cac45a HMD.mounted instead of HMD.isMounted 2017-04-10 08:05:01 -07:00
Philip Rosedale
c74778116a Merge pull request #10156 from Triplelexx/21256 
21256 - Add packet loss % to stats
 2017-04-09 18:00:01 -07:00
Vladyslav Stelmakhovskyi
7628916db6 Check if dialog was opened from StackView and then pop or just go to home menu 2017-04-09 20:09:15 +02:00
Triplelexx
7936637e9c and tired.. 2017-04-09 11:02:35 +01:00
Triplelexx
54eb7c10c6 distracted 2017-04-09 10:50:22 +01:00
Triplelexx
ec6885a2fb change audioPacketLoss stat to display largest of upstream/downstream loss 2017-04-09 09:49:41 +01:00
Seth Alves
aa89903a9f Merge pull request #10160 from vladest/tabletwebview-yahoo-fix 
Yahoo, Reddit etc now works correctly
 2017-04-08 20:25:18 -07:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Chris Collins
1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix 
Check if offset outside image, set to last image
 2017-04-07 15:58:48 -07:00
David Kelly
948a821824 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 14:30:22 -07:00
Anthony J. Thibault
e065c1bac4 Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API 2017-04-07 14:12:03 -07:00
Anthony J. Thibault
40844d2a49 Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API. 2017-04-07 14:03:31 -07:00
David Kelly
174b2978e3 username stays around now when tabbing to connections 2017-04-07 14:01:36 -07:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938 
updated availability combo dialog
 2017-04-07 13:57:17 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug 
Stop WebEntities Running Files and Commands
 2017-04-07 13:44:03 -07:00
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -07:00
Andrew Meadows
92495d9622 delete in proper order on shutdown 2017-04-07 11:10:48 -07:00
Andrew Meadows
8773497f7e remvoe commented out cruft 2017-04-07 11:08:06 -07:00
Andrew Meadows
1fb88a0315 add a helpful comment 2017-04-07 11:08:06 -07:00
Andrew Meadows
6d627aa9bc don't remove other avatars on sign-out 2017-04-07 11:08:06 -07:00
Andrew Meadows
2f18e51f6b lock mutex around fading avatar list 2017-04-07 11:08:06 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Vladyslav Stelmakhovskyi
a1892b351f Cant use underscores outside class internals 2017-04-07 19:40:46 +02:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi
9a563ba02f Check if offset outside image, set to last image 2017-04-07 19:17:09 +02:00
Andrew Meadows
40e223cb82 cleanup unused return values and redundant variables 2017-04-07 09:58:04 -07:00
Andrew Meadows
2775b17a65 unravel one loop of spaghetti 2017-04-07 09:56:26 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
Triplelexx
fcfd206e9c change implict conversions 2017-04-07 17:47:04 +01:00
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help 
fix pal connections-tab help trigger
 2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930 
friends checkbox speedup
 2017-04-07 09:27:39 -07:00
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi
f88ba7bc57 Yahoo, Reddit etc now works correctly 2017-04-07 15:45:33 +02:00