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

2816 commits

Author SHA1 Message Date
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
Stephen Birarda
79231cdee0 fix switched signature for completed bake handling 2017-08-25 17:10:09 -07:00
Stephen Birarda
cc7dd2162b fixes for OS X build 2017-08-25 17:03:52 -07:00
Atlante45
0755b77615 Fix for mac build 2017-08-25 16:32:32 -07:00
Atlante45
065721d23f Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake 2017-08-25 16:22:14 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
Atlante45
700b11e28b Fix bad conditional 2017-08-25 16:17:37 -07:00
Atlante45
a36ddf7b6d Fix failed connection 2017-08-25 16:13:29 -07:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
7d103d24f4 Integrate my and Huffman's work 2017-08-25 15:21:08 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
859ec57ded Move Baking Status 2017-08-25 10:54:33 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -07:00
Atlante45
fac6015bb0 Asset baking status first pass 2017-08-25 10:54:30 -07:00
Atlante45
cefd16ad95 Fix asset server debug messages logging category 2017-08-25 10:52:49 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Liv
1ae4a5c019 remove class from function call 2017-08-15 15:30:43 -07:00
Stephen Birarda
96672becc6 read redirected path info in MappingRequest 2017-08-15 15:19:20 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
Stephen Birarda
03e952ec38 fix extension check for get mapping redirect 2017-08-14 14:09:35 -07:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Stephen Birarda
bef093b8e5 add handling for completed bake 2017-08-11 13:40:30 -07:00
Stephen Birarda
8d0ed51035 clear entity tree in Agent if ES disappears 2017-08-10 11:02:56 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Liv
5ea7fbc62a Add node check on permissions for deletion 2017-07-21 10:27:30 -07:00
Liv
26558da794 Fix stupid typo that was giving connection refused - now working 2017-07-20 18:07:08 -07:00
Liv
4ba9b08125 first attempt at url handling in octree server 2017-07-20 14:00:51 -07:00
Liv
bdb12c38cf Move API call to Entities scripting and out of Users 2017-07-20 11:41:57 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Atlante45
91d65469a0 Use timer instead of dedicated thread to tick avatar 2017-07-17 15:52:52 -07:00
Atlante45
366ce69e66 Add info on how the child AC finished 2017-07-14 11:39:32 -07:00
Brad Hefta-Gaub
b063c2f45d Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission 
Cleanup OctreeSendThread::packetDistributor()
 2017-07-13 09:58:28 -07:00
Clément Brisset
d346b1c68f Merge pull request #10924 from Atlante45/fix/debug-asserts 
Misc servers debug asserts fixes
 2017-07-12 15:05:15 -07:00
Atlante45
b3d73fd0df Add comments to DebugDraw instanciation 2017-07-12 10:39:15 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Andrew Meadows
1fe7718b9f restore wasted byte count when unable to fit stats 2017-07-11 15:02:45 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Andrew Meadows
badbe98097 minor cleanup and constency for packet stats 2017-07-11 14:21:49 -07:00
Andrew Meadows
3226d33830 use cached OctreeSendThread::_nodeUuid 2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832 + OctreeSendThread::traverseTreeAndSendContents() 
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets

also cleaned up some of the packet stats tracking
 2017-07-11 13:53:08 -07:00