Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 16:53:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59074 commits 25 branches 0 tags 1.1 GiB
Commit graph

3411 commits

Author SHA1 Message Date
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Clément Brisset
7d4f17506e Merge branch 'feat/auto-bake' into feat/bake-meta-errors 2017-09-01 17:33:25 -07:00
Seth Alves
0855dfc1c6 PR-11290 didn't actually bump protocol version 2017-09-01 17:26:32 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled 
Wire "Use baked" checkbox
 2017-09-01 16:25:49 -07:00
Ryan Huffman
c67fcc1384 Add RedirectFail to ResourceRequest::getResultString() 2017-09-01 10:41:31 -07:00
Ryan Huffman
bf53161a0b Fix comparison between signed and unsigned int in MappingRequest 2017-08-31 15:55:27 -07:00
Ryan Huffman
25f64e1aa9 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 15:17:40 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Ryan Huffman
d2c7235fed Fix update to count width in GetAllMappings 2017-08-31 14:41:29 -07:00
Atlante45
a9cfc01df3 Set Baking Enabled API 2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c Move constant to central location 2017-08-31 13:08:18 -07:00
Stephen Birarda
b1bc899121 Merge pull request #11270 from birarda/feat/auto-bake 
refuse to perform mapping operations in /.baked/
 2017-08-31 13:06:28 -07:00
Stephen Birarda
da8ae23756 move default to the bottom of bakingStatusToString 2017-08-31 11:52:42 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Ryan Huffman
31345e4264 Fix ATP requests not keeping track of all mapping redirects 2017-08-30 13:15:14 -07:00
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
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -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
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
Stephen Birarda
9dfc74de57 always write rank ID to variant when present 2017-08-22 11:24:32 -07:00
Stephen Birarda
1eb7fb5b3d always write rank ID to variant when present 2017-08-21 17:15:44 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Stephen Birarda
a59103aad5 truncate filename for relative path URL in RR 2017-08-15 15:38:47 -07:00
Stephen Birarda
100ac65975 store relative path URL in resource request on redirect 2017-08-15 15:27:44 -07:00
Stephen Birarda
96672becc6 read redirected path info in MappingRequest 2017-08-15 15:19:20 -07:00
Stephen Birarda
db3524a48f add re-direct of get mapping for baked assets 2017-08-11 14:26:27 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Seth Alves
83a30e2f35 missed some statics 2017-08-06 13:12:27 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
humbletim
3bcbec87e0 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-30 16:15:34 -04:00
Zach Fox
bd5f7b85d8 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde 2017-07-26 14:11:28 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -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
Stephen Birarda
2d0c5ff37a remove preloading of allowed user keys since it happens on connect 2017-07-25 11:41:34 -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
26558da794 Fix stupid typo that was giving connection refused - now working 2017-07-20 18:07:08 -07:00
humbletim
d9de0a8687 bump AvatarMixer protocol version 2017-07-18 17:46:59 -04:00