Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38112 commits 2 branches 0 tags 1.1 GiB
Commit graph

38112 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8 Merge pull request #6849 from jherico/atmosphere 
Remove old atmosphere rendering
 2016-01-21 17:58:59 -08:00
samcake
b5aa5fcb46 more clean up 2016-01-21 17:36:53 -08:00
Stephen Birarda
9127edc968 Merge pull request #6892 from huffman/fix-asset-migration 
Fix ATP file copy
 2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub
094e41c993 Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes 
Fix wifi ping spikes
 2016-01-21 17:07:38 -08:00
samcake
846c5a7b9a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 16:56:40 -08:00
samcake
8eddd52731 Fixing coding guidelines 2016-01-21 16:54:37 -08:00
Brad Hefta-Gaub
1a98ab3fba Merge pull request #6877 from AndrewMeadows/crash-fix 
fix interface crash when deleting lots of objects at once
 2016-01-21 16:49:21 -08:00
Ryan Huffman
99bb1fcbe1 Remove dirs from atp copy 2016-01-21 16:46:45 -08:00
Ryan Huffman
c9ea6e7eb6 Fix ATP file copy 2016-01-21 16:45:13 -08:00
samcake
402809fe2f FIxing coding standards 2016-01-21 16:44:35 -08:00
samcake
9c344c6498 FIxing the bordering enble default value 2016-01-21 16:38:21 -08:00
Leonardo Murillo
a3ccf7014c Merge pull request #6890 from huffman/fix-asset-migration 
Fix asset server data migration
 2016-01-21 18:12:07 -06:00
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
Ryan Huffman
996f3f5df7 Fix entity server data migration to work with default persist filename 2016-01-21 15:43:45 -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
Ryan Huffman
e63ac03123 Fix asset server data migration 2016-01-21 15:26:52 -08:00
Stephen Birarda
f4b94e0ea6 explicitly remove server console targets from ALL_BUILD 2016-01-21 15:19:31 -08:00
Brad Davis
47a1c16430 Resolving warnings 2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
3e7f29a0aa Support debug mode for QML UI in debug builds 2016-01-21 15:15:16 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -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