Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 04:10:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9352 commits 21 branches 0 tags 1.2 GiB
Commit graph

9352 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
028eec7164 don't allow calls to init, run, evaluate from JS 2014-02-03 10:33:31 -08:00
ZappoMan
0bcbe485c0 Merge pull request #1815 from birarda/script-timer 
expose QTimer to the script engine
 2014-02-03 10:27:04 -08:00
Stephen Birarda
e2842ab7a4 stop timers when the script does, add cleanup methods 2014-02-03 10:10:58 -08:00
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
Stephen Birarda
9dd8c11e1e change script timer setup to match HTML dom standard 2014-02-03 09:59:16 -08:00
Stephen Birarda
d9cfaec4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer 2014-02-03 09:32:13 -08:00
Stephen Birarda
e6c0aa1082 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 09:29:27 -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
ca9e82e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-31 19:42:21 -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
Andrew Meadows
32df731aae Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-01-31 17:55:05 -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
Andrew Meadows
a5aff81881 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-01-31 17:44:13 -08:00
Andrew Meadows
ed93d8db39 Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar. 2014-01-31 17:42:48 -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
Stephen Birarda
a7f2406505 add an example timer script 2014-01-31 16:40:24 -08:00
Stephen Birarda
d2fd4bf445 expose QTimer to the script engine 2014-01-31 16:36:44 -08:00
Stephen Birarda
30f23424f9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 16:26:28 -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
Andrew Meadows
a7ffb7df1d Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar. 2014-01-31 13:17:12 -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