Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56482 commits 75 branches 59 tags 1.2 GiB
Commit graph

56482 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
5c0e9e7496 improve wording for MyAvatar.qmlPosition doc 2017-06-19 14:52:32 -07:00
Zach Pomerantz
f0bc080502 fix tab 2017-06-19 14:51:30 -07:00
Brad Davis
8aeeab30e7 Merge pull request #10689 from Atlante45/fix/ktx 
Fix KTX performance problems
 2017-06-19 14:44:52 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Pomerantz
d3d36324c0 play sample output sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
071a8a783c add sample sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
1bf16c4318 update fonts 2017-06-19 14:41:00 -07:00
howard-stearns
91656a5fe5 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-19 14:22:12 -07:00
Zach Fox
2e215e6544 Fix build problems 2017-06-19 14:04:51 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Stephen Birarda
3f580031d1 Merge pull request #10742 from seefo/fb5368 
Domain server settings will now tell user if saving will restart DS
 2017-06-19 13:23:15 -07:00
seefo
1619d877d3 Made requested changes to domain server settings.js 2017-06-19 13:21:13 -07:00
howard-stearns
c6d66d439b report and quit command line switches 2017-06-19 12:57:26 -07:00
seefo
705ce4c789 Changed domain server restart/save button behavior to be correct 2017-06-19 12:09:20 -07:00
seefo
3d4b9c82aa Changed indentation to be consistent 2017-06-19 11:56:45 -07:00
seefo
3224bf5af0 Domain server settings will now tell user if saving will restart DS 2017-06-19 11:52:49 -07:00
Chris Collins
655dbd0703 Merge pull request #10741 from highfidelity/RC-44 
Beta Release 44 - Includes up to Developer Release 6702
 2017-06-19 11:33:58 -07:00
Brad Davis
a004e5fbe8 PR feedback 2017-06-19 11:21:08 -07:00
Brad Davis
a9096aa7f0 Prevent deadlocks from different locking orders in FileCache 2017-06-19 11:21:08 -07:00
Seth Alves
39fb94d76d fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-19 11:21:08 -07:00
Atlante45
c4c6142935 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx 2017-06-19 11:06:51 -07:00
Atlante45
8d45c4da7c Fix comments 2017-06-19 11:02:31 -07:00
Chris Collins
16822720cc Merge pull request #10725 from highfidelity/RC-44 
Beta Release 44 - Includes up to Developer Release 6702
 2017-06-19 10:58:24 -07:00
Brad Davis
f790a9bf5c Merge pull request #10735 from jherico/cache_eject_crash 
Fix for occasional crash on switching domains
 2017-06-19 10:53:34 -07:00
Stephen Birarda
2933a20a0c some cleanup for audio/avatar replicated packet checking 2017-06-19 10:45:33 -07:00
Zach Fox
5245237bb2 Removing unmergeable files before PR 2017-06-19 10:33:22 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Vladyslav Stelmakhovskyi
9fb947ea3c Merge branch 'master' into fix_audio_qt59 2017-06-19 16:17:31 +02: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
36ff765d7f Make sure registered object have different name from iport alias 2017-06-18 22:19:28 +02:00
Vladyslav Stelmakhovskyi
a662a0e984 Merge branch 'fix_tablet_buttons_qt59' into fix_audio_qt59 2017-06-18 21:53:59 +02: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
Chris Collins
f7721b1ad0 Merge pull request #10732 from Atlante45/master 
Stable > RC-44
 2017-06-16 17:50:31 -07:00