Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 11:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55618 commits 76 branches 59 tags 1.2 GiB
Commit graph

55618 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Cake
b528c2fc60 Merged 2017-05-31 19:33:14 -07:00
Stephen Birarda
1d9d83b157 initial version of the ClosureEventSender using std::thread 2017-05-31 19:00:41 -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
David Rowe
f0c56dac3f Further files required for record script 2017-06-01 09:09:17 +12: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
Vladyslav Stelmakhovskyi
02d9aa2e31 Merge branch 'master' into create_in_landscape 2017-05-31 15:50:23 +02: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
Dante Ruiz
41869430f7 made some changes that were requested 2017-05-31 01:29:32 +01:00
samcake
8559ed6260 Starting to add the stencil mask for hmd 2017-05-30 16:37:10 -07:00
Dante Ruiz
b3401d9762 making some final changes 2017-05-30 23:55:45 +01:00
Dante Ruiz
9c787eb784 removed commented code 2017-05-30 22:59:12 +01:00
Dante Ruiz
a0ba1a64b5 Merge branch 'master' of github.com:highfidelity/hifi into head-puck 2017-05-30 22:52:57 +01:00
Dante Ruiz
4c4811dca8 finished the head puck 2017-05-30 22:52:39 +01:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
Ryan Huffman
4a52f4090d Merge pull request #10552 from huffman/fix/multiple-nic-lockup 
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
 2017-05-30 13:05:01 -07:00
Stephen Birarda
9fa900bac8 Merge pull request #10568 from thoys/fix-doc-headers 
Fix markdown headers
 2017-05-30 12:29:27 -07:00
Thijs Wenker
68ad8fa981 visual headers 2017-05-30 21:12:51 +02:00
Stephen Birarda
60125eb1d7 Merge pull request #10567 from highfidelity/openssl-win-installer-update 
OpenSSL installer update
 2017-05-30 12:03:20 -07:00
Thijs Wenker
1ea3b2b7f4 let headers be headers 2017-05-30 21:01:42 +02:00
Thijs Wenker
1339516177 OpenSSL installer update 2017-05-30 20:56:45 +02:00
Brad Davis
765bd3890e Improving test code for KTX library 2017-05-30 10:47:49 -07:00
Stephen Birarda
41716ec56b Merge pull request #10554 from seefo/master 
Moved audio asset processing to a separate thread
 2017-05-30 10:44:53 -07:00
Seth Alves
250e381ea7 Merge pull request #10563 from Atlante45/fix/reset-settings 
Fix "retain avatar info"
 2017-05-30 10:00:55 -07:00
Vladyslav Stelmakhovskyi
0f80a8b7af On create button, switch Tablet to landscape mode 2017-05-30 16:51:04 +02:00
David Rowe
8de93d9651 Fix typo noticed in passing 2017-05-30 15:53:58 +12:00
David Rowe
f5066aac51 Don't adjust position of imported entities of particular types 2017-05-30 15:53:03 +12:00
David Rowe
1e8698aee1 Snap imported JSON to grid 2017-05-30 15:23:18 +12:00
David Rowe
e02021bddf Tidying 2017-05-30 14:38:59 +12:00
David Rowe
b176dbe544 Refactoring 2017-05-30 14:35:59 +12:00
David Rowe
4c0296daaa Reposition imported JSON entities so that they start at import distance 2017-05-30 14:29:10 +12:00
David Rowe
18558dd795 Make JSON import distance 2m 2017-05-30 13:34:17 +12:00
David Rowe
31df18ff5b Fix snap-to-grid elevation 2017-05-29 18:43:49 +12:00
David Rowe
6c890d90ef Adjust position of model after its been resized 2017-05-29 17:48:01 +12:00
David Rowe
f0785cd39e Adjust creation position so that bounding box is creation distance away 2017-05-29 13:52:36 +12:00