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
9174 commits 71 branches 56 tags 1.2 GiB
Commit graph

9174 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
8b2f185937 always emit update even when no servers 2014-02-03 10:05:26 -08:00
ZappoMan
906d913d71 added more examples, updated lookWithMouse.js to support alwaysLook 2014-02-03 10:05:07 -08:00
ZappoMan
8797c35834 Merge pull request #1824 from ey6es/master 
Fixes for transforms and blendshapes on Blender FBX exports.
 2014-01-31 22:05:14 -08:00
Andrzej Kapolka
2b4876181a Different take on the transform fix. 2014-01-31 19:38:45 -08:00
Andrzej Kapolka
ee0b6fad55 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 19:00:58 -08:00
Andrzej Kapolka
e1350f8e24 Trying out a transform tweak. 2014-01-31 19:00:24 -08:00
ZappoMan
ed3f7b9d28 Merge pull request #1822 from birarda/cleanup 
application destructor cleanup, spacing cleanup
 2014-01-31 18:03:19 -08:00
AndrewMeadows
867b66e73e Merge pull request #1817 from ZappoMan/more_scripting_work 
More scripting work
 2014-01-31 17:54:44 -08:00
Stephen Birarda
40a963cf92 some application destructor cleanup 2014-01-31 17:50:51 -08:00
Stephen Birarda
d65a3ee174 spacing cleanup in Application and ScriptEngine 2014-01-31 17:38:53 -08:00
ZappoMan
b99a5fd0a4 Merge pull request #1811 from birarda/uuid-title 
add user UUID to application window title
 2014-01-31 17:14:31 -08:00
ZappoMan
579c601ff7 Merge pull request #1810 from birarda/master 
scripting nomenclature changes
 2014-01-31 17:14:07 -08:00
ZappoMan
ffb40e9fbc Merge pull request #1816 from birarda/socket-notifier 
force queued connection for readyRead on node socket in case it's not on the same thread
 2014-01-31 17:13:26 -08:00
ZappoMan
289be04f0f use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface 2014-01-31 17:12:50 -08:00
Stephen Birarda
c754663582 force queued connection for readyRead on node socket in case it moves, closes #1685 2014-01-31 17:09:08 -08:00
ZappoMan
5b825ecd5b fix isKnownID 2014-01-31 15:46:19 -08:00
ZappoMan
19f218f37c fix typo 2014-01-31 15:45:31 -08:00
ZappoMan
00e98ee42b make tryLock actually return a bool 2014-01-31 15:44:48 -08:00
Andrzej Kapolka
ea4524bcf0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 15:25:30 -08:00
Andrzej Kapolka
ff2afca50e Special handling for blendshapes in Blender exports. They're under the model, 
like the geometry.
 2014-01-31 15:24:54 -08:00
Stephen Birarda
dba7fbceac remove extra Script and commented out line 2014-01-31 15:00:35 -08:00
ZappoMan
6129f07ed4 Merge pull request #1806 from birarda/ds-icons 
fix missing font-icon in DS web interface
 2014-01-31 14:57:40 -08:00
Stephen Birarda
8fc55bd196 add user UUID to application window title 2014-01-31 14:56:04 -08:00
Stephen Birarda
9015b24aa5 update the script examples for new nomenclature 2014-01-31 14:41:24 -08:00
Stephen Birarda
dd83ff0538 move isAvatar property access to Agent object 2014-01-31 14:36:50 -08:00
Stephen Birarda
4b18e37dfb fix for ttf return in DS, closes #1769 2014-01-31 14:13:05 -08:00
ZappoMan
9798538ea5 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-31 14:10:45 -08:00
ZappoMan
7a3ce7c89d Merge pull request #1805 from birarda/master 
remove unused UUID from OctreeQuery
 2014-01-31 13:48:49 -08:00
Stephen Birarda
9b549723d3 remove unused UUID from OctreeQuery 2014-01-31 13:47:59 -08:00
ZappoMan
599e57b5c2 Merge pull request #1804 from birarda/master 
remove a double push in OctreeQuery parsing
 2014-01-31 13:45:03 -08:00
Stephen Birarda
254a0c0aed remove a double push on UUID in OctreeQuery 2014-01-31 13:44:24 -08:00
Stephen Birarda
685f9ebb5b Merge pull request #1798 from ZappoMan/master 
check against NULL node from nodeWithUUID()
 2014-01-31 13:30:36 -08:00
ZappoMan
5caaf0dc7f check against NULL node from nodeWithUUID() 2014-01-31 13:28:56 -08:00
ZappoMan
cea2f9414a Merge pull request #1790 from kordero/master 
Readme: Updated Ubuntu dependencies
 2014-01-31 13:09:02 -08:00
ZappoMan
a5271108fb Merge pull request #1795 from birarda/master 
fix push of bytes read during creation of dummy packets
 2014-01-31 13:08:35 -08:00
Stephen Birarda
b16d03c42a remove an unneeded todo 2014-01-31 12:46:03 -08:00
Stephen Birarda
2cc6d22181 fix push bytesRead when creating dummy Avatar packets, closes #1794 2014-01-31 12:44:09 -08:00
Stephen Birarda
0fea0964f0 Merge pull request #1791 from birarda/master 
fix multiple avatar parsing in AvatarManager
 2014-01-31 12:04:10 -08:00
Lucas Crisman
18ce012d7a simplifying text 2014-01-31 17:03:57 -03:00
Stephen Birarda
4573eaebc6 fix multiple avatar parsing in AvatarManager 2014-01-31 12:02:24 -08:00
Lucas Crisman
73aa73fd58 joining paragraphs 2014-01-31 17:00:27 -03:00
Lucas Crisman
fd07449195 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 16:52:57 -03:00
Lucas Crisman
bd1d0201e0 Updated Ubuntu package requirements 2014-01-31 16:52:20 -03:00
AndrewMeadows
9021ccef89 Merge pull request #1789 from birarda/assert-crash 
add back old HandData parsing
 2014-01-31 11:33:31 -08:00
Stephen Birarda
9d82347994 add a missing return 2014-01-31 11:32:23 -08:00
Stephen Birarda
4bf8f3a465 reinstate old HandData parsing 2014-01-31 11:29:15 -08:00
AndrewMeadows
19e8ddd202 Merge pull request #1788 from birarda/assert-crash 
fix incorrect packet position in AvatarData
 2014-01-31 11:24:43 -08:00
AndrewMeadows
f277e00780 Merge pull request #1785 from birarda/post-event 
repairs to VoxelImporter to remove warning, closes #1758
 2014-01-31 11:23:01 -08:00
Stephen Birarda
4ed748752f fix incorrect packet position in AvatarData, closes #1786 2014-01-31 11:20:36 -08:00
Stephen Birarda
217135a8d6 repairs to VoxelImporter to remove QCoreApplication warning 2014-01-31 11:00:44 -08:00