Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38090 commits 71 branches 56 tags 1.2 GiB
Commit graph

38090 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
samcake
16573357d8 FIxing the AO results at the border of the frame by guarding the fetch out of the frame 2016-01-21 15:50:38 -08:00
Seth Alves
ee42c1d7c8 Merge pull request #6889 from birarda/console 
explicitly remove server console targets from ALL_BUILD
 2016-01-21 15:43:15 -08:00
Stephen Birarda
f4b94e0ea6 explicitly remove server console targets from ALL_BUILD 2016-01-21 15:19:31 -08:00
Leonardo Murillo
7e19110dd5 Merge pull request #6887 from birarda/migrate-ds-old-dev 
migrate domain-server config from single org name
 2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0 handle weird nested path on windows 2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0 migrate domain-server config from single org name 2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
4cfe3941f4 delete the lookup timeout timer once fired 2016-01-21 11:18:53 -08:00
Stephen Birarda
f12e0b5fd0 simplify callback for domain API get 2016-01-21 11:15:50 -08:00
Philip Rosedale
7387d6e5f1 Merge pull request #6869 from imgntn/pistolfix 
Make Pistol Quieter and Minor Adjustments
 2016-01-21 11:15:07 -08:00
Stephen Birarda
b1c151b165 remove dead code in main.cpp 2016-01-21 11:04:39 -08:00
Philip Rosedale
398296c874 Merge pull request #6883 from ericrius1/sphereLOD 
Test script for lod testing of sphere entities and sphere overlays
 2016-01-21 11:04:26 -08:00
Stephen Birarda
7c9dc2e2bb add a comment for QProcess non-dangling pointer 2016-01-21 11:02:34 -08:00
Stephen Birarda
77b9c24d99 rename the console notification icon 2016-01-21 10:57:13 -08:00
ericrius1
5132406d37 Test script for lod testing 2016-01-21 10:51:15 -08:00
Ryan Huffman
f162c9220f Merge pull request #6882 from birarda/audio-mixer-coma 
repair the audio-mixer coma debug
 2016-01-21 10:37:28 -08:00
Stephen Birarda
63da0074b4 repair the audio-mixer coma debug 2016-01-21 10:26:03 -08:00
James B. Pollack
f0ff0b45de Update hiddenEntityReset.js 2016-01-21 09:33:56 -08:00
James B. Pollack
e63e509835 Update createPistol.js 2016-01-21 09:33:38 -08:00
James B. Pollack
ff9eb7f20d Update masterReset.js 2016-01-21 09:33:21 -08:00
Chris Collins
5dc1eb986e Merge pull request #6874 from imgntn/fixgrabparticlesystems 
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
 2016-01-21 09:25:11 -08:00
Andrew Meadows
58a7528b68 Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js 
Access avatar parent information from js
 2016-01-21 09:19:40 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
Brad Hefta-Gaub
61ab400131 Merge pull request #6881 from ctrlaltdavid/fix-connected-signal 
Wire up missing GlobalServices.connected() signal
 2016-01-21 09:06:35 -08:00
Eric Levin
0cfd9e429a Merge pull request #6872 from imgntn/messageTests 
Add Messaging Tests and Organize
 2016-01-21 09:05:23 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Philip Rosedale
fde13ae2e4 Merge pull request #6875 from imgntn/removesearchsphereonequip 
Remove Search Sphere After Far Equip
 2016-01-20 19:22:53 -08:00
Clément Brisset
9d97335a0e Merge pull request #6878 from birarda/audio-mixer-coma 
add some debug for the next audio mixer coma
 2016-01-20 19:07:51 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
Stephen Birarda
9c270822e4 Merge pull request #6873 from Atlante45/feat/default-dyn-jitter-buffer 
Default dynamic jitter buffer to true on AM
 2016-01-20 18:25:07 -08:00
Stephen Birarda
5e451360f7 add some debug for the next audio mixer coma 2016-01-20 18:22:37 -08:00
Stephen Birarda
0d47e812c8 fix typo in NSIS variable 2016-01-20 18:20:13 -08:00
Stephen Birarda
6daa34f164 fix component variable in NSIS template 2016-01-20 18:11:22 -08:00
Brad Hefta-Gaub
7919d7bc17 Merge pull request #6866 from jherico/menufix 
Fixing overlay menu popup & some more QML cleanup
 2016-01-20 16:58:21 -08:00
Stephen Birarda
13d6ec0b28 make the post install options read correct 2016-01-20 16:54:31 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00
Stephen Birarda
583feddac0 Merge pull request #75 from huffman/console-content-always 
Update content downloader to always d/l if no content present
 2016-01-20 16:03:23 -08:00
Ryan Huffman
36d725b67a Update content downloader to always d/l if no content present 2016-01-20 15:51:08 -08:00
Ryan Huffman
5784b81290 Merge pull request #74 from birarda/console-migrate-sm 
add option to migrate Stack Manager content
 2016-01-20 15:43:16 -08:00
Stephen Birarda
2d3e036102 Merge pull request #73 from huffman/console-log-rot 
Add deletion of old log files
 2016-01-20 15:38:08 -08:00
Ryan Huffman
b7e939bbdd Adjust console logs for deleting old files 2016-01-20 15:35:31 -08:00
Ryan Huffman
c31ceeca86 Add deletion of old log files 2016-01-20 15:35:30 -08:00
Stephen Birarda
fc3cee776f split directory debug into two lines 2016-01-20 15:35:29 -08:00
Stephen Birarda
f872dfac04 remove some unused variables 2016-01-20 15:31:23 -08:00
Stephen Birarda
d08a64a4d6 use a big try-catch for migration block 2016-01-20 15:25:58 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
Stephen Birarda
6ec55dc746 only wait for state change for migration once 2016-01-20 15:06:46 -08:00
Stephen Birarda
430d1351db preserve timestamps for assets copy 2016-01-20 14:58:15 -08:00