Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 12:06:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54071 commits 6 branches 1 tag 1.1 GiB
Commit graph

54071 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
086941356a fix frozen bots 2017-04-28 14:36:38 -07:00
Chris Collins
6ecbaff56e Merge pull request #10297 from ZappoMan/retrySkeletonURL 
format and spelling changes
 2017-04-26 21:58:51 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
Chris Collins
df7cb09fe4 Merge pull request #10255 from ZappoMan/retrySkeletonURL 
Fix two cases for avatars stuck in T-Pose
 2017-04-26 21:38:19 -07:00
Chris Collins
b2870be25c Merge pull request #10256 from jherico/fix_stored_size 
Fix excessive copying when querying the size of a KTX backed texture
 2017-04-26 21:31:19 -07:00
ZappoMan
3e766675c5 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 21:05:28 -07:00
Seth Alves
60453f8748 Merge pull request #10294 from ctrlaltdavid/record-for-marketplace 
Make record script able to be put on the marketplace
 2017-04-26 19:34:39 -07:00
Brad Davis
7be40a48a1 Merge branch 'master' into fix_stored_size 2017-04-26 19:08:04 -07:00
ZappoMan
76902b15d3 remove one last debug log 2017-04-26 18:51:41 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx 
Add progressive load for KTX textures
 2017-04-26 18:36:01 -07:00
Ryan Huffman
60ba874e2e Fix implementation of mutableData in non-File Storage classes 2017-04-26 18:02:23 -07:00
ZappoMan
a26dca73b1 more logging 2017-04-26 18:02:09 -07:00
Ryan Huffman
f5b7feccde Update AssetClient/Request to use const byteRange 2017-04-26 18:01:56 -07:00
Ryan Huffman
fee36453a3 Move hifi.minMip 2017-04-26 17:53:17 -07:00
Ryan Huffman
cb299695f4 Update imageOffset to size_t 2017-04-26 17:52:53 -07:00
Thijs Wenker
2fd6786225 Merge pull request #10295 from PhilipRosedale/halfDuplex 
Reduce log spam
 2017-04-27 02:17:48 +02:00
Brad Davis
fa0fb11329 Remove uneeded memory to memory copy for mip transfers 2017-04-26 17:14:39 -07:00
Brad Davis
960c29edb7 Fix excessive copying when querying the size of a KTX backed texture 2017-04-26 17:12:48 -07:00
Ryan Huffman
47cf44dc60 Store offset to min mip kv in KtxStorage 2017-04-26 17:11:19 -07:00
Philip Rosedale
a880ca1262 Reduce log spam 2017-04-26 16:51:26 -07:00
ZappoMan
1f9e07b828 more logging 2017-04-26 16:40:13 -07:00
Ryan Huffman
4395cd7ee1 Update hasPendingTransfers to not touch _pendingTransfers 2017-04-26 16:31:42 -07:00
Ryan Huffman
f509403b25 Update prioritization of memory pressure states 2017-04-26 16:31:42 -07:00
Ryan Huffman
f15a34e145 Cleanup data pointer calculations in assignMipData 2017-04-26 16:31:42 -07:00
Atlante45
19d5414c30 Reduce High Mips request size 2017-04-26 16:23:09 -07:00
David Rowe
9c7353deb2 Make record script able to be put on the marketplace 2017-04-27 11:22:25 +12:00
anshuman64
d146431e9b Merge pull request #10268 from druiz17/input-recorder 
Input recorder/ input playback system  for all input actions
 2017-04-26 16:20:20 -07:00
anshuman64
c088bd6891 Merge pull request #10271 from humbletim/21281 
CR Job #21281 -- Doppleganger Mirror
 2017-04-26 16:18:14 -07:00
Howard Stearns
7654823775 Merge pull request #10292 from thoys/make-connection-fix 
makeUserConnection.js Fix for alternative skeletons
 2017-04-26 16:02:16 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
humbletim
6e07933356 uncomment UserActivityLogger.logAction 2017-04-26 18:28:54 -04:00
ZappoMan
3de92121e0 more logging 2017-04-26 15:28:10 -07:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Ryan Huffman
c7ac82b4e2 Remove magic number for kv and image sizes 2017-04-26 15:09:26 -07:00
Ryan Huffman
e4e554aaea Remove dead code from Texture.h 2017-04-26 15:09:26 -07:00
Ryan Huffman
7bb6010149 Fixup targetAllocatedMip inside gl textures 2017-04-26 15:09:26 -07:00
Ryan Huffman
1bd95ee19f Remove didQueueTransfer check from populateTransferQueue 2017-04-26 15:09:26 -07:00
Ryan Huffman
6a0474934c Fixup variabletexture ctors 2017-04-26 15:09:26 -07:00
Ryan Huffman
a71d246e75 Replace canPopulate with _minAllocatedMip 2017-04-26 15:09:26 -07:00
Chris Collins
c28a5b2342 Merge pull request #10293 from zzmp/fix/tablet-typo 
fix tablet resolve typo
 2017-04-26 15:02:23 -07:00
Atlante45
70ece9f0fd Load skybox first and sounds later 2017-04-26 14:57:23 -07:00
humbletim
cabeced66e * changes per feedback and testing 
* add support for UserActivityLogger.logAction (commented-out, pending #10130)
* autodisable doppleganger when avatar changes model
* autodisable doppleganger when user moves to a different domain
* use ModelCache.prefetch for detecting model load status
* expose new signals to help keep activity logging and debugging decoupled
 2017-04-26 17:51:21 -04:00
humbletim
060d5aa3cb add "Resource" API global 2017-04-26 17:49:14 -04:00
Thijs Wenker
26173700b8 Merge pull request #10267 from Triplelexx/21287 
21287 - Newly created entities in Edit.js should be grabbable
 2017-04-26 23:16:04 +02:00
Dante Ruiz
95d6a451c6 fixed work mapping 2017-04-26 22:14:53 +01:00
ZappoMan
7154a11192 add some more logging 2017-04-26 14:03:36 -07:00