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

55496 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
77eb75db95 add .json to extension 2017-06-01 22:48:59 +01:00
Dante Ruiz
6bc53388f8 Merge branch 'master' of github.com:highfidelity/hifi into record-standard 2017-06-01 22:34:57 +01: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
Dante Ruiz
2a5c43026a gzip recording data 2017-06-01 22:27:51 +01: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
c0003f6791 Merge branch 'master' of github.com:highfidelity/hifi into record-standard 2017-06-01 19:06:50 +01:00
Dante Ruiz
9a8030cc09 Merge branch 'recorder-fix' into record-standard 2017-06-01 19:01:54 +01:00
Dante Ruiz
0e82b33d6d final changes 2017-06-01 19:00:31 +01:00
Dante Ruiz
e52765b641 playback recording back through the standard inputs 2017-06-01 18:51:24 +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
Dante Ruiz
a1e0737928 saving work 2017-06-01 18:06:06 +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
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
0372deebff Last warnings? 2017-05-31 22:09:30 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -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 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
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
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
Seth Alves
66415dadc6 Merge pull request #10496 from volansystech/Wl-21298 
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace  using the scrollbar.
 2017-05-27 08:28:19 -07:00
Sam Gateau
bc44a03e13 Merge pull request #10537 from samcake/brown 
Fix the flickering and other lighting issues related to zone entities (part 1)
 2017-05-26 18:22:56 -07:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Chris Collins
fd3b6cdf1a Merge pull request #10564 from birarda/bug/content-loading-always 
fix progress bar / stats reference to pending transfer count
 2017-05-26 15:29:06 -07:00
Stephen Birarda
6c2758e4ea fix reference to pending transfer count for progress/stats 2017-05-26 14:37:24 -07:00