Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 00:07:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48978 commits 22 branches 28 tags 1.2 GiB
Commit graph

48978 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Stephen Birarda
396c2bc28f add error for login after signup, fix link style 2016-12-08 17:00:47 -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
Stephen Birarda
b66ddbdbdb add email field, error handling for sign up inputs 2016-12-08 16:16:37 -08:00
Faye Li Si Fi
33142d6a7f mvp progress 2016-12-08 16:01:50 -08:00
Faye Li Si Fi
52b54dbf0c Merge remote-tracking branch 'refs/remotes/highfidelity/master' 2016-12-08 15:10:57 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Stephen Birarda
556ccb90f7 make a SignUpBody loaded by LoginDialog 2016-12-08 14:35:41 -08:00
samcake
8df1ffd38f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-08 14:17:29 -08:00
Atlante45
5f2c77928a Restore "Updated the Qt audio plugins"" 
This reverts commit f7e8d47426.
 2016-12-08 14:14:48 -08:00
Clément Brisset
06331494af Revert "Revert "Select Audio DLL at runtime"" 2016-12-08 14:14:03 -08:00
Clément Brisset
e539840439 Merge pull request #9165 from highfidelity/stable 
Merge Stable back into Master
 2016-12-08 14:12:14 -08:00
Brad Hefta-Gaub
6edd3a9338 Merge pull request #9168 from jherico/cpu_opt_aabb 
Optimized method for transforming axis aligned bounding boxes
 2016-12-08 13:45:16 -08:00
Faye Li Si Fi
1644c2eeb4 added unit test 2016-12-08 11:17:38 -08:00
Zach Pomerantz
5969c1eb06 ensure all accesses of audio pool num are guarded 2016-12-08 14:12:16 -05:00
Zach Pomerantz
eafbeb6d44 Revert "avoid pessimizing audio slave lock contention" 
This reverts commit 3508e71753.
 2016-12-08 14:10:00 -05:00
Bradley Austin Davis
3fcd45a236 Optimized method for transforming axis aligned bounding boxes 2016-12-08 10:59:14 -08:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Zach Pomerantz
3508e71753 avoid pessimizing audio slave lock contention 2016-12-08 01:53:25 +00:00
Zach Pomerantz
6e0ad5a7ed initialize audio threads 2016-12-08 01:52:58 +00:00
Atlante45
7b0b777051 Honor reorient and quit request from OVR 2016-12-07 17:29:54 -08:00
Stephen Birarda
801a384607 a simple signup dialog copied from login dialog 2016-12-07 16:14:20 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Zach Pomerantz
f5b4fac46d set default audio threads to 1 2016-12-07 18:47:33 -05:00