Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 07:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9220 commits 25 branches 0 tags 1.1 GiB
Commit graph

9220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
3af86cb1a4 Working on script loading. 2014-02-04 14:07:01 -08:00
Andrzej Kapolka
fd31cc02ad Working on loading scripts. 2014-02-04 14:06:17 -08:00
Andrzej Kapolka
a043278f03 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-04 11:25:18 -08:00
Andrzej Kapolka
cfbe4de647 Progress on shared object attributes; basic "throbbing" guide working. 2014-02-03 19:46:22 -08:00
Andrzej Kapolka
3f529e37b5 Working on streaming objects. 2014-02-03 16:34:04 -08:00
Stephen Birarda
f1b612d8d8 Merge pull request #1835 from birarda/master 
fix for toyball crash
 2014-02-03 16:27:01 -08:00
Stephen Birarda
d563c89482 fix for ScriptEngine crash 2014-02-03 16:25:38 -08:00
Stephen Birarda
f11ac778c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 16:16:23 -08:00
Andrzej Kapolka
7dfb83b6cc Fix for obtaining values from editor. 2014-02-03 14:35:29 -08:00
Andrzej Kapolka
449cf1fbd3 Layout fix. 2014-02-03 12:45:45 -08:00
ZappoMan
c739c2452a Merge pull request #1832 from birarda/script-timer 
hide ScriptEngine calls from JS
 2014-02-03 12:45:41 -08:00
AndrewMeadows
6dc959f780 Merge pull request #1831 from ZappoMan/scripting 
More scripting work
 2014-02-03 12:43:56 -08:00
ZappoMan
d04a9c4d05 Merge pull request #1823 from AndrewMeadows/cleanup 
cleanup: moving stuff out of Application and AvatarManager into MyAvatar
 2014-02-03 12:39:13 -08:00
Andrew Meadows
cb186b10db Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/Application.cpp
 2014-02-03 12:29:44 -08:00
Andrzej Kapolka
8df6d2bb6b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-03 11:21:44 -08:00
ZappoMan
f33f4e9cc2 change invaders to use absolute positions 2014-02-03 11:09:30 -08:00
Stephen Birarda
a5cee02cc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 11:03:01 -08:00
ZappoMan
f41d2a3c02 change Agent to Script 2014-02-03 10:35:25 -08:00
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