Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 17:03:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56040 commits 25 branches 28 tags 1.2 GiB
Commit graph

56040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Brad Davis
7b2369976a Merge pull request #10736 from sethalves/fix-ubuntu-quazip-build 
build quazip with c++11
 2017-06-18 16:51:40 -07:00
Ryan Huffman
fefedd63e4 Merge pull request #10728 from thoys/cooking/bake-shortBow 
bake shortbow
 2017-06-18 16:39:33 -07:00
Seth Alves
ec1187991d Merge pull request #10734 from vladest/fix_tablet_buttons_qt59 
Fix tablet buttons qt59
 2017-06-18 13:48:26 -07:00
Seth Alves
f42146c139 dry up quazip cmake 2017-06-18 13:24:24 -07:00
Vladyslav Stelmakhovskyi
59a77c16bd Cleanup 2017-06-18 20:59:22 +02:00
Seth Alves
a1571608db try some more 2017-06-18 11:48:11 -07:00
Seth Alves
242d615b50 sigh 2017-06-18 11:16:36 -07:00
Seth Alves
fd137e1a84 build quazip with c++11 2017-06-18 10:22:50 -07:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Clément Brisset
3262e10d76 Merge pull request #10727 from jherico/file_cache_locking 
Prevent deadlocks from different locking orders in FileCache
 2017-06-17 15:13:47 -07:00
Vladyslav Stelmakhovskyi
a1475bc65f Forgot if statement 2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
Brad Davis
1632e3b35a PR feedback 2017-06-16 20:04:23 -07:00
Howard Stearns
532df863b9 Merge pull request #10726 from zfox23/PAL_FixGoToUser 
Fix teleporting to another user from the PAL
 2017-06-16 18:08:11 -07:00
Brad Davis
0af6b3b749 Merge pull request #10719 from ctrlaltdavid/21397 
Ensure desktop dialogs' title bars are visible
 2017-06-16 17:35:18 -07:00
Thijs Wenker
57692051c0 bake shortbow 2017-06-17 01:56:38 +02:00
Zach Fox
6230dcf93d Thanks to Thoys! 2017-06-16 16:34:35 -07:00
Zach Fox
74fde8efd7 Revert "Fix teleporting to another user from the PAL" 
This reverts commit 6b659101d5.
 2017-06-16 15:33:47 -07:00
Brad Davis
a675dfe7d2 Prevent deadlocks from different locking orders in FileCache 2017-06-16 15:30:50 -07:00
Zach Fox
6b659101d5 Fix teleporting to another user from the PAL 2017-06-16 15:09:13 -07:00
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386 
Fixed a bug where you could not print polaroids if you took a gif
 2017-06-16 15:03:45 -07:00
Chris Collins
a0cd210b60 Merge pull request #10724 from Atlante45/master 
Stable -> Master
 2017-06-16 13:48:37 -07:00
Atlante45
69a5444993 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-16 13:43:41 -07:00
Chris Collins
f160034bf0 Merge pull request #10681 from zzmp/audio/parity 
Revamp audio device selection
 2017-06-16 10:31:55 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
David Rowe
3cee2b3764 Ensure desktop dialogs' title bars are visible 2017-06-16 20:10:24 +12:00
Thijs Wenker
87a6b16d16 Merge pull request #10713 from huffman/feat/remove-tutorial 
Remove /tutorial in favor of new repo
 2017-06-16 01:18:40 +02:00
Stephen Birarda
c7e37a09fb Merge pull request #10710 from seefo/fb5376 
Fixed a bug where custom port wasn't used in AC when passed through CLI
 2017-06-15 15:38:11 -07:00
Zach Pomerantz
eb4255e1ac fix audio checkbox bindings 2017-06-15 18:21:23 -04:00
Ryan Huffman
154b33bddb Remove /tutorial in favor of new repo 
Tutorial code has been moved to a new hifi-tutorial repo
 2017-06-15 15:17:45 -07:00
seefo
6d480600d8 Fixed a bug where custom port wasn't used in AC when passed through CLI 2017-06-15 14:59:36 -07:00
Chris Collins
a1933b535d Merge pull request #10704 from sethalves/remove-chat-from-default-scripts 
remove chat from default scripts
 2017-06-15 14:44:47 -07:00
Andrew Meadows
5e0be1a823 Merge pull request #10662 from ctrlaltdavid/21394 
Smoothly ease hands from uncontrolled to controlled positions
 2017-06-15 13:17:26 -07:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Brad Hefta-Gaub
0597c3105f Merge pull request #10705 from ZappoMan/moreAudioFixes 
fix no audio device from previously removed audio device
 2017-06-15 11:04:14 -07:00
Seth Alves
023ca85623 remove chat from default scripts 2017-06-15 09:27:43 -07:00
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
druiz17
347f020b04 Merge pull request #10692 from jherico/fix_tablet_crash 
Fix crash on exit when tablet is open
 2017-06-15 08:15:02 -07:00
Brad Hefta-Gaub
c807827a36 Merge pull request #10693 from seefo/master 
Incomplete sandbox content updates are now removed and reperformed
 2017-06-14 19:32:01 -07:00
Andrew Meadows
9c928f16b2 Merge pull request #10632 from Atlante45/fix/node-leak 
Fix SharedNodePointer leak
 2017-06-14 17:03:52 -07:00
Andrew Meadows
becb968a75 Merge pull request #10685 from ctrlaltdavid/21327-b 
Use HMD roll angle to turn while flying or walking in HMD
 2017-06-14 16:56:29 -07:00
seefo
9fa21fc79f Incomplete sandbox content updates are now removed and reperformed 2017-06-14 14:45:25 -07:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
David Rowe
55e0082792 Code review 2017-06-15 09:10:08 +12:00
Brad Davis
7a6df850c5 Fix crash on exit when tablet is open 2017-06-14 13:22:53 -07:00
howard-stearns
665870b846 comment per cr 2017-06-14 12:06:29 -07:00
howard-stearns
2deb26551f typos in comments/help-strings 2017-06-14 11:56:47 -07:00