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

71091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -07:00
Wayne Chen
c6229c5c60 updating serverless file to have dynamic oops 2018-09-05 10:37:45 -07:00
Wayne Chen
f38a26a1ff updating location of oops dialog script 2018-09-05 09:04:17 -07:00
Wayne Chen
afd7321e7f updating redirect with proper fbx 
TODO: fix path when uploaded the fbx files
 2018-09-04 23:16:59 -07:00
Wayne Chen
29b96d0bb2 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-09-04 22:17:49 -07:00
Wayne Chen
af1c473a9c updating with models in meshes folder 2018-09-04 22:17:33 -07:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler 2018-09-04 19:58:56 -07:00
Wayne Chen
1ce6c84c08 updating metacall for loadServerlessDomain 2018-09-04 18:24:49 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Wayne Chen
002c6547ee entity script URL update 2018-09-04 14:08:13 -07:00
Wayne Chen
22a8164401 adding back refusal notifications + domain bounds/floor 2018-09-04 13:53:03 -07:00
Wayne Chen
a7abebd7aa adding redirect json to post build in Mac 2018-09-04 11:11:34 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Wayne Chen
b6d23843dd adding fix to domain redirection URL 2018-08-30 22:32:02 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback 
Filter timings used in feedback logic for workload region sizes
 2018-08-30 19:11:49 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Sam Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash 
Fix blendshape crash
 2018-08-30 17:10:24 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix 
Avatar without Neck Joint bug 14620
 2018-08-30 14:52:44 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange 
Hand Azimuth Controls Shoulder Rotation
 2018-08-30 13:59:00 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables 
Fix Android StateController assert
 2018-08-30 13:37:13 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master 
send MyAvatar avatar entity updates through entity tree
 2018-08-30 10:25:31 -07:00
David Back
8b1fcfcce9 fix double windows platform 2018-08-30 10:16:27 -07:00
Andrew Meadows
6c4862910e smoother edges for workload region feedback response 2018-08-30 10:13:35 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse 
findRayIntersection/findParabolaIntersection performance improvements
 2018-08-30 09:49:16 -07:00
Wayne Chen
f07f326f06 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 09:08:22 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Sam Gondelman
cfffa65819
Merge pull request #13899 from SamGondelman/pointerPerf 
Improve Pointer performance
 2018-08-29 16:57:43 -07:00
Wayne Chen
eb29c9c4a2 updating with default landing location 2018-08-29 16:53:22 -07:00
Stephen Birarda
aaf5f593c5 send MyAvatar avatar entity updates through entity tree 2018-08-29 16:30:24 -07:00
Angus Antley
9fb0f8b7c0 added condition to prevent overwriting tracker input with estimated orientation for spine2 joint 2018-08-30 00:25:53 +01:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Wayne Chen
0c8964b16f Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-29 16:12:57 -07:00
Wayne Chen
a5243fbd7e commenting out notification for script 2018-08-29 16:12:50 -07:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping 
Edit mode controller mapping using new platform state variables
 2018-08-29 16:06:47 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses 
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
 2018-08-29 14:29:12 -07:00
SamGondelman
cda8b82ead improve pointer performance 2018-08-29 13:32:53 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 
MS16847: Tablet button doesn't load in HMD mode
 2018-08-29 13:20:04 -07:00
Angus Antley
f7d0cdda02 added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth 2018-08-29 20:44:21 +01:00
John Conklin II
26f76081e6
Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir 
Read glTF resources from other than the main directory
 2018-08-29 12:31:41 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
David Back
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
Andrew Meadows
a134357489 fix compile typo 2018-08-29 11:37:19 -07:00
Sam Gondelman
156f1dc60d
Merge pull request #13852 from Cristo86/android_lists_in_mem_cached_fast 
Android - Domains and Users Lists - memory cache for quick loads
 2018-08-29 11:24:12 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00