Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-18 16:58:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76507 commits 6 branches 1 tag 1.1 GiB
Commit graph

76507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
0ddb4ecd7c Allow per-machine customization of which android projects are loaded 2019-02-19 12:10:26 -08:00
SamGondelman
2986ca20c5 Merge remote-tracking branch 'upstream/master' into pal 2019-02-19 11:31:40 -08:00
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao 
Case 20993: Fix AO
 2019-02-19 11:19:03 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick 
Case 21291, Case 21292, Case 21293: Working on overlay bugs
 2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity 
Case 20920: Move Material Entity logic to render thread
 2019-02-19 10:59:51 -08:00
John Conklin II
0f8c36156b
Merge pull request #14952 from SamGondelman/textColor 
Case 21305: Fix text overlay color property
 2019-02-19 10:58:32 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory 
Case 20657: artist stocking inventory
 2019-02-19 10:46:01 -08:00
Anthony Thibault
9a0163f404 Add README.md file to tools/jsdoc/out directory to prevent jsdoc generation failures during build 2019-02-19 10:36:35 -08:00
danteruiz
4bbae1230d making requested chantges 2019-02-19 10:07:36 -08:00
Bradley Austin Davis
b1a120cdfa
Merge pull request #14954 from amerhifi/feature/quest 
Feature/quest
 2019-02-19 09:44:39 -08:00
Sam Gateau
b46c79b113
Merge pull request #14942 from SamGondelman/hashLock 
Case 21277: Fix avatar deadlock
 2019-02-19 09:12:02 -08:00
amer cerkic
ae796c2484 rerouted the intent back to interfaceActivity since its back and registered in manifest 2019-02-19 07:42:35 -08:00
Angus Antley
f2301e7dac fixed relative wrist correction problem 2019-02-19 07:35:13 -08:00
amer cerkic
9a0078a216 fixing compile errors. 2019-02-19 07:32:05 -08:00
SamGondelman
927e824610 fix missing color for text overlays 2019-02-18 16:14:07 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -08:00
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
935d827421 try to cull wearables with avatars 2019-02-17 02:10:25 -08:00
Angus Antley
e1dfd7d288 cleanup white space 2019-02-16 23:40:16 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
85421cd6ee speed up stylus picks 2019-02-16 21:16:46 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Sam Gondelman
c8ab7ac37f
fix bad copy 2019-02-16 18:08:05 -08:00
Angus Antley
0982c37c5e took out the theta animvar and just use theta converted to pole vector 2019-02-16 14:50:47 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
amerhifi
04b5877da9
Merge pull request #10 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 17:29:30 -08:00
SamGondelman
d50904dd4a fix avatar deadlock 2019-02-15 17:08:24 -08:00
SamGondelman
3e3bd2ffd8 fix transform properties not changing 2019-02-15 16:57:29 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
SamGondelman
6bf1545285 fix build error 2019-02-15 16:44:28 -08:00
Brad Davis
bfda7d73c1 Fix frame player 2019-02-15 16:39:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
SamGondelman
0f33d696d2 trying to fix pal colors 2019-02-15 16:12:36 -08:00
Brad Davis
02a95b599d fix extra shadergen args 2019-02-15 15:57:19 -08:00
John Conklin II
e77cdfc0d2
Merge pull request #14936 from sabrina-shanman/bug_gltf_mat-support 
(case 21231) Fix GLTF materials
 2019-02-15 15:43:31 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor 
Case 21012: Avatar Doctor
 2019-02-15 15:43:18 -08:00
amantley
95530e6ba5 removed the unnecessary animArmIK.h and .cpp 2019-02-15 15:41:23 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00
amantley
36093926d0 added fake android defines for running the new ik on pc 2019-02-15 15:00:39 -08:00
Thijs Wenker
e900d3784b fixes 2019-02-15 23:58:42 +01:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
SamGondelman
3df231f1e0 it's working! 2019-02-15 14:43:22 -08:00
amerhifi
6ea941e4a8
Merge pull request #8 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 14:40:45 -08:00
Brad Davis
00ed86d1cf fixing typo 2019-02-15 14:34:40 -08:00
Brad Davis
f896623404 Fix prebuild crash if can't find git binary (such as when running under Android Studio) 2019-02-15 14:30:54 -08:00
amerhifi
0fa0b07577
Merge pull request #7 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 14:26:44 -08:00
John Conklin II
3969a0433e
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme 
Case 21193: update nitpick readme
 2019-02-15 14:23:13 -08:00