Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-04 13:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56191 commits 21 branches 0 tags 1.2 GiB
Commit graph

56191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369 
WL 21369 - Implement parts of the JS "console" object
 2017-06-20 11:06:34 -07:00
Zach Pomerantz
7f90f8af45 Merge pull request #10746 from zzmp/audio/mute-check 
Emphasize mute state with red
 2017-06-20 10:58:11 -07:00
Seth Alves
428dc81083 Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race 
ignore remote update younger than recent ownership bid
 2017-06-20 10:42:54 -07:00
druiz17
a5913af9b4 Merge pull request #10737 from vladest/fix_audio_qt59 
Fix audio qt59
 2017-06-20 09:41:58 -07:00
Thijs Wenker
07fefdcb2f Merge pull request #10748 from samcake/brown 
Fix the local lights issue
 2017-06-20 05:17:18 +02:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Stephen Birarda
3619294761 Merge pull request #10745 from seefo/fb5367 
Added a restart button to domain server settings page
 2017-06-19 16:35:36 -07:00
Stephen Birarda
603c47f0da Merge pull request #10656 from birarda/bug/range-bigger-than-file 
fix ATP range requests for small ktx files
 2017-06-19 16:10:09 -07:00
Stephen Birarda
cf9a97cf10 use length sent by AssetServer to verify asset size 2017-06-19 15:15:45 -07:00
Zach Pomerantz
7512332104 replace mic-mute icons with red variants 2017-06-19 15:07:28 -07:00
Zach Pomerantz
6adfe34661 make mute red check 2017-06-19 15:07:28 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
Howard Stearns
ddce665613 Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 
Spectator Camera - Mergeable Rendering Components
 2017-06-19 14:55:43 -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 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
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
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
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
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
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
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