Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 15:31:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55520 commits 25 branches 0 tags 1.1 GiB
Commit graph

55520 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
4a419f2d07 Merging with upstream 2017-06-01 18:25:24 -07:00
samcake
14f9a9848e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-01 18:05:47 -07:00
samcake
c5e9551bab more cleanup 2017-06-01 18:05:18 -07:00
Stephen Birarda
6a89726a6a Merge pull request #10593 from birarda/log-api-session-id 
print the metaverse session ID to the debug log
 2017-06-01 18:02:17 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -07:00
Stephen Birarda
06b3ecfdc3 also log metaverse session ID during ctor of AccountManager 2017-06-01 15:50:56 -07:00
Seth Alves
4c69ec4365 Merge pull request #10588 from druiz17/recorder-fix 
Changed  the input recorder to store actions by strings
 2017-06-01 14:34:09 -07:00
Dante Ruiz
725388043f removed double semi-colons 2017-06-01 22:30:50 +01:00
Stephen Birarda
3d98f1b3ee print metaverse session ID to debug log 2017-06-01 13:46:37 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
Zach Fox
4e929f6d92 Merge pull request #10581 from zfox23/snapshot_fixForUrlShare 
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
 2017-06-01 11:51:14 -07:00
Dante Ruiz
0e82b33d6d final changes 2017-06-01 19:00:31 +01:00
David Kelly
017955dca8 Merge pull request #10587 from davidkelly/dk/5028 
Don't allow sorting on non-sortable columns in PAL
 2017-06-01 10:49:11 -07:00
Dante Ruiz
c686acc071 fixing build issue 2017-06-01 18:20:56 +01:00
Dante Ruiz
23a9209285 Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix 2017-06-01 18:06:37 +01:00
David Kelly
b6b2f92af2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028 2017-06-01 09:58:07 -07:00
Andrew Meadows
e27199601f Merge pull request #10585 from samcake/orange 
Fixing warnings
 2017-06-01 09:33:16 -07:00
samcake
257813ec38 comment the code 2017-06-01 09:19:02 -07:00
Dante Ruiz
36002e8b92 Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix 2017-06-01 17:01:59 +01:00
David Kelly
f79c9ea021 we can sort on ignored 2017-06-01 07:29:31 -07:00
David Kelly
a17886aa58 do not allow sorting on non-sortable columns in PAL 2017-06-01 07:24:03 -07:00
Sam Cake
ea6be93c9c adding another flavor of the prepare stencil 2017-06-01 01:24:57 -07:00
Sam Cake
07eb1d89e1 fixing the warning on macosx about the non portable file name 2017-05-31 23:59:44 -07:00
Sam Cake
3c9b14ee94 Oene more fix 2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
Sam Cake
e02115bcda clearing up the stencil jobs 2017-05-31 23:00:05 -07:00
Sam Cake
0372deebff Last warnings? 2017-05-31 22:09:30 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
Sam Cake
b528c2fc60 Merged 2017-05-31 19:33:14 -07:00
Sam Cake
c28584c8f4 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-31 17:06:13 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Zach Fox
53701371ab Fix some bugs :( 2017-05-31 16:43:21 -07:00
Dante Ruiz
cca0fa6600 fixed some input recorder design issue 2017-06-01 00:23:37 +01:00
David Kelly
c29091f0b1 Merge pull request #10582 from davidkelly/dk/4996 
remove extra activity logger call
 2017-05-31 15:18:17 -07:00
Zach Fox
70fdb4a168 Fix incorrectly sharing old snapshots 2017-05-31 14:47:07 -07:00
Zach Fox
fd92afff8c Ensure old snaps don't accidentally get shared for_url 2017-05-31 14:47:07 -07:00
Brad Davis
a77491ccb1 FileCache refactoring and tests 2017-05-31 13:45:59 -07:00
David Kelly
e1700915f7 remove extra activity logger call 2017-05-31 13:28:57 -07:00
Howard Stearns
b552566bf8 Merge pull request #10580 from manapa01/Default-Discoverability-Mode 
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
 2017-05-31 13:00:15 -07:00
Seth Alves
e80704f3c9 Merge pull request #10578 from thoys/fix/grabableDynamic 
Edit.js: Fix hidden dynamic property while clone-able is active
 2017-05-31 12:54:36 -07:00
Zach Fox
8d02a93727 Merge pull request #10576 from zfox23/snapshot_AddErrorImage 
Add placeholder image when previous snapshot can't be loaded
 2017-05-31 11:19:32 -07:00
Thijs Wenker
5c5aaf3254 Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates 2017-05-31 20:18:42 +02:00
Patrick Manalich
7b69a5dbd5 Changed the DEFAULT_DISCOVERABILITY_MODE to Connections 2017-05-31 10:46:04 -07:00
Zach Fox
0441d8c703 Add placeholder image when previous snapshot can't be loaded 2017-05-31 10:27:17 -07:00
Dante Ruiz
7fcdc61244 add head puck offset preference 2017-05-31 18:20:35 +01:00
samcake
5d32ed8589 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-31 09:35:37 -07:00
Dante Ruiz
f4328af66f made final requested changes 2017-05-31 17:12:27 +01:00
Sam Cake
32c5dac66a Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil 2017-05-31 00:55:28 -07:00