Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-15 08:09:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56552 commits 6 branches 1 tag 1.1 GiB
Commit graph

56552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
fd137e1a84 build quazip with c++11 2017-06-18 10:22:50 -07:00
Matti Lahtinen
600a39c9b2 Fixed Zone overriding Client. 2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Cain Kilgore
394560c979 Added sound effect (temp) when you hit a ball, plus added a check to ensure the game doesn't hang waiting for balls out of the arena. 2017-06-18 07:27:49 +01:00
Cain Kilgore
135beb2d48 Small amounts of cleanup - added Smoke effect when Ball is Hit by Arrow 2017-06-18 02:03:29 +01: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
Chris Collins
f7721b1ad0 Merge pull request #10732 from Atlante45/master 
Stable > RC-44
 2017-06-16 17:50:31 -07:00
Atlante45
d8ec85d02c Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-16 17:49:06 -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
Atlante45
d090ac4396 CR 2017-06-16 17:04:57 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Thijs Wenker
57692051c0 bake shortbow 2017-06-17 01:56:38 +02:00
Andrew Meadows
b105ad8338 measure linear velocity of tractor position 2017-06-16 16:55:00 -07:00
Cain Kilgore
26446b6b33 Debugging info - check what the arrow hit 2017-06-17 00:51:34 +01:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Zach Fox
6230dcf93d Thanks to Thoys! 2017-06-16 16:34:35 -07:00
Cain Kilgore
80b50927d3 Added smoke image & references 2017-06-17 00:33:16 +01:00
Cain Kilgore
2e56b0d639 Test C ommit 2017-06-17 00:29:25 +01: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
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Atlante45
097e75285a Remove extra profiling 2017-06-16 14:31:56 -07:00
Atlante45
c2650c2b71 Declare KTXDescriptor* metatype 2017-06-16 14:31:56 -07:00
Atlante45
54fc8085f3 Remove pointer to file in NetworkTexture 2017-06-16 14:31:56 -07:00
Atlante45
4d3fc39ab6 Make KTX async tasks thread safe 2017-06-16 14:31:56 -07:00
Atlante45
fb8aa96a57 Add resource processing tracking to KTX 2017-06-16 14:31:56 -07:00
Atlante45
306b55e45d Synchronous mip loading 2017-06-16 14:31:56 -07:00
Atlante45
57e8d8e1fd Fix download retries 2017-06-16 14:31:56 -07:00
Atlante45
31d2592e7d Handle header and high mips in the same callback 2017-06-16 14:31:56 -07:00
Atlante45
d2251bb840 Offload ktx processing to threadpool 2017-06-16 14:31:56 -07:00
Atlante45
3110dd72bf More ktx work 2017-06-16 14:31:56 -07:00
Atlante45
35a0c41cf5 Move Ktx processing to thread pool. 2017-06-16 14:31:56 -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
NeetBhagat
2909aa9ac8 Resolve comments of @zappoman. 
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
 2017-06-17 01:00:32 +05:30
Zach Fox
54bf0c64a7 Merge pull request #10715 from zfox23/spectatorCamera_buttonMapping 
Spectator Camera controller button mapping + QML Language Fix
 2017-06-16 10:33:17 -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
Zach Fox
378d8e80cf Remove random component of button mapping name 2017-06-16 10:08:58 -07:00
Zach Fox
e2c6993ae9 Fix bug found by Cain with his patch - thank you! 2017-06-16 10:08:58 -07:00
Zach Fox
749dede8b3 Start with empty string for checkbox 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
65b910bcf6 Support Vive 2017-06-16 10:08:58 -07:00