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

38146 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
a9cf836cb0 added isVec3NaN and isQuatNaN functions 2016-01-22 11:13:55 -08:00
Seth Alves
6294939095 missed one 2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a use isNaN rather than a self-comparison 2016-01-22 10:36:21 -08:00
Seth Alves
451464cb47 check values in location updates for NaN before using them 2016-01-22 09:41:46 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00
Brad Hefta-Gaub
b41301d226 Merge pull request #6879 from sethalves/fix-aa-cube-bug 
fix query-cube vs lod bug
 2016-01-21 21:02:42 -08:00
samcake
7df3e9f306 Merge pull request #6876 from ericrius1/droplets 
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
 2016-01-21 18:32:43 -08:00
Stephen Birarda
40f2afb284 Merge pull request #6898 from Atlante45/fix/ds-shutdown-debug 
Postpone logging of the shutdown reason
 2016-01-21 18:31:19 -08:00
Stephen Birarda
cc96d90a21 Merge pull request #6897 from huffman/fix-asset-migration 
Fix asset server not creating resources directory before migrating
 2016-01-21 18:25:48 -08:00
Stephen Birarda
9061e33a1f send path query once connected to domain 2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae use the index path as default with network address 2016-01-21 18:24:16 -08:00
Stephen Birarda
15c922f4a5 always respond with default index path 2016-01-21 18:24:16 -08:00
Stephen Birarda
e371aa8ba5 remove the hard coded path from domain link 2016-01-21 18:24:16 -08:00
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
Atlante45
6fd5176474 Pospone logging of the shutdown reason 
This makes it more obvious to the log reader why the DS went
down.
 2016-01-21 17:54:10 -08:00
Ryan Huffman
f9718931b0 Fix asset server not creating resources directory before migrating 2016-01-21 17:40:12 -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
Seth Alves
c2edb0a559 Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug 2016-01-21 16:15:06 -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