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

54117 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anshuman Dewangan
54e4eb5eae Updated downloads to direct links 2017-04-26 15:17:34 -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
Anshuman Dewangan
c13f63a4f4 Changed references from Qt 5.6.1 to 5.6.2 2017-04-26 14:47:03 -07:00
Chris Collins
3b839d3f9b Merge pull request #10290 from samcake/hotfix 
Build 37.2 Hotfix to fix a crash with texture loading and Qt build 5.6.2
 2017-04-26 14:28:24 -07: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
Ryan Huffman
8ba56a96df Merge pull request #10240 from zzmp/fix/hmd-tutorial 
Condition tutorial on active HMD
 2017-04-26 14:00:02 -07:00
Thijs Wenker
bf81ae78b9 Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix 
# Conflicts:
#	scripts/system/makeUserConnection.js
 2017-04-26 22:52:57 +02:00
David Rowe
a68ee02e8d Log script start-up 2017-04-27 08:41:29 +12:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Anshuman Dewangan
ed6211fcb7 First commit 2017-04-26 13:26:14 -07:00
Chris Collins
11c21cc871 Merge pull request #10291 from jherico/hotfix_back_merge 
Stable - Master hotfix merge back
 2017-04-26 13:25:16 -07:00
Brad Hefta-Gaub
f1bd371fbe Merge pull request #10175 from PhilipRosedale/springHold 
New Tutorial and entity scripts
 2017-04-26 13:16:17 -07:00
Triplelexx
e295ab2778 change location of menu item Create Entities As Grabbable 2017-04-26 21:13:39 +01:00
Thijs Wenker
d05229d3b4 fix conversion 2017-04-26 22:11:56 +02:00
Andrew Meadows
fd874429c1 remove unused cruft 2017-04-26 12:51:16 -07:00
Andrew Meadows
ac751029c0 remove identity cache code 2017-04-26 12:51:16 -07:00
Andrew Meadows
4511156d7b cache avatar identity info forever 2017-04-26 12:50:48 -07:00
Andrew Meadows
08972da843 remove unused Node::_isAlive cruft 2017-04-26 12:47:56 -07:00
Andrew Meadows
75c2776836 remove keep-alive packet from avatar-mixer 2017-04-26 12:47:27 -07:00
Thijs Wenker
20a9b60e7b this might make it work 2017-04-26 21:42:36 +02:00
ZappoMan
7840377109 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 12:39:30 -07:00
ZappoMan
5dd6daaad7 send identity on nodeActivated not nodeAdded 2017-04-26 11:42:38 -07:00
Andrew Meadows
ac6d4969d6 Merge pull request #10270 from Atlante45/fix/unload 
Fix entity script unloads
 2017-04-26 11:42:14 -07:00
Ryan Huffman
1555fc3088 Update Resource to only clear load priorities if successful 2017-04-26 11:37:48 -07:00
Ryan Huffman
01724c9c90 Update default load priority to be 0 2017-04-26 11:37:47 -07:00
Ryan Huffman
0f461a2188 Fix priority being reset when requesting low mips 2017-04-26 11:37:47 -07:00
Ryan Huffman
3184ddb29f Fix duplicate low mip calculation in NetworkTexture 2017-04-26 11:32:36 -07:00
Ryan Huffman
29641ba69a Fix min mip not being written to ktx correctly 2017-04-26 11:32:36 -07:00
Ryan Huffman
4f16eb9bcc Cleanup KTX logging and add fragment to resource url to indicate mip level 2017-04-26 11:32:35 -07:00
ZappoMan
517bbc795f interface/ 2017-04-26 11:29:42 -07:00
Ryan Huffman
b9ec573c8b Update gl41 an gl45 texture backends to take into account min avail mip 2017-04-26 11:21:43 -07:00