Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:31:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49101 commits 75 branches 59 tags 1.2 GiB
Commit graph

49101 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
8719d36cd9 Merge pull request #9125 from kencooke/audio-ambisonics 
First-order Ambisonic renderer
 2016-12-12 11:36:12 -08:00
Stephen Birarda
a0663bdf31 fix resizing of LoginDialog and friends 2016-12-12 11:32:19 -08:00
Philip Rosedale
a142c830fa Merge branch 'master' of git://github.com/highfidelity/hifi into rescale 2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09 Both grip buttons enable rescale for a held object 2016-12-12 09:39:32 -08:00
Brad Hefta-Gaub
87e8b6bfeb only consider standard poses written if the pose was valid 2016-12-12 09:23:01 -08:00
Brad Hefta-Gaub
b57c1fe198 remove debug spam 2016-12-12 08:48:24 -08:00
Brad Hefta-Gaub
d51b408c12 more work on hand tracking 2016-12-12 08:46:21 -08:00
samcake
06b7388930 Merge pull request #9182 from fayeli/photobooth 
Photobooth Improvements - Stage, Camera Angles, and Lights
 2016-12-10 20:04:40 -08:00
Faye Li Si Fi
78c96293a7 Staging cameras, lights, and backdrop 2016-12-09 17:25:18 -08:00
Faye Li Si Fi
c078751946 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into photobooth 2016-12-09 17:23:54 -08:00
Stephen Birarda
e4810a5643 Merge pull request #9179 from Atlante45/controller-mapping 
Update Xbox controller mapping to have the menu on Start
 2016-12-09 17:13:45 -08:00
Ken Cooke
a4cbf6be8a Fix to preserve localOnly from script when not ambisonic 2016-12-09 16:55:53 -08:00
Stephen Birarda
691ce4312e fix resizing for keyboard changes in body loaded qml 2016-12-09 16:49:53 -08:00
Atlante45
5def039bd4 Swap start/back xbox controller mapping to conform to Oculus standard 2016-12-09 16:41:42 -08:00
Stephen Birarda
f0f10d837c fix indents, fix resize for keyboard changes 2016-12-09 16:04:42 -08:00
Chris Collins
c912d77a95 Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit 
Honor reorient and quit request from OVR
 2016-12-09 16:03:41 -08:00
Thijs Wenker
3ec06b1a6e Remove redundant parentheses 2016-12-10 00:21:20 +01:00
Seth Alves
dd3f3957a9 Merge pull request #9164 from fayeli/last-edited-property 
Exposing last edited property of Entity to Javascript
 2016-12-09 13:13:11 -08:00
Faye Li Si Fi
b3ac62bb56 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-09 12:44:17 -08:00
Thijs Wenker
4d467deb5e Fix if statement to match style rule 4.2.8 2016-12-09 21:26:59 +01:00
Anthony Thibault
c8f30128c5 Merge pull request #9173 from sethalves/tablet-ui 
Tablet ui
 2016-12-09 11:22:34 -08:00
samcake
7f73f61e25 Merge pull request #9174 from fayeli/photobooth 
Photobooth MVP - Dev tool for taking standardized product pictures
 2016-12-09 11:01:51 -08:00
Stephen Birarda
89016f4f15 Merge pull request #9171 from Atlante45/updater 
No updater command line argument
 2016-12-09 10:56:29 -08:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
Thijs Wenker
3f9aa00fd6 Increased show-radius to 20 meters 2016-12-09 19:39:48 +01:00
Seth Alves
819e3dc41d remove some unneeded html special-casing 2016-12-09 10:18:30 -08:00
Seth Alves
37b179b00b remove commented-out code 2016-12-09 09:55:02 -08:00
Brad Davis
3f9ffd1f9c Merge pull request #9177 from samcake/blue 
Fix the missing lighting on AMD
 2016-12-09 09:28:31 -08:00
Brad Hefta-Gaub
fdf9dc432d only build if kinect SDK is available 2016-12-09 08:30:33 -08:00
Brad Hefta-Gaub
053b1bedc4 add orientation 2016-12-09 08:29:21 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
Brad Hefta-Gaub
b6838c6ec4 more debugging 2016-12-08 23:32:03 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Chris Collins
b72aa83afa Merge pull request #9169 from samcake/red 
Fix the highlight issue introduced RC 29 - 5774
 2016-12-08 21:12:47 -08:00
Thijs Wenker
9397108b3b clear -> cleanup typo 2016-12-09 03:14:05 +01:00
Thijs Wenker
3ceac7d071 Fix for "cannot access member `sessionUUID' of deleted QObject" error 2016-12-09 02:44:43 +01:00
Stephen Birarda
80699e826a put back production METAVERSE_SERVER_URL 2016-12-08 17:30:00 -08:00
Stephen Birarda
673e03aae4 add a spinner to sign up 2016-12-08 17:29:29 -08:00
Thijs Wenker
28e8bb69ec ignore camera man 2016-12-09 02:29:21 +01:00
Stephen Birarda
370de667d5 add a spinner to the login dialog 2016-12-08 17:23:39 -08:00
Thijs Wenker
387f73b349 reset avatar beacons on domain change 2016-12-09 02:11:05 +01:00
Seth Alves
e06a445959 remove some cruft 2016-12-08 17:00:50 -08:00
Stephen Birarda
396c2bc28f add error for login after signup, fix link style 2016-12-08 17:00:47 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Thijs Wenker
dfb4c7cf89 avatarFinderBeacon 2016-12-09 01:41:19 +01:00
Atlante45
aa1d90108c No updater command line argument 2016-12-08 16:35:30 -08:00
Stephen Birarda
9445fc2898 fix for display of multiple sign up errors 2016-12-08 16:28:16 -08:00