Ryan Huffman
701fcd3542
Fix invalid check for null object in registerGetterSetter
2014-04-30 11:29:01 -07:00
Ryan Huffman
9e684a0bc8
Add registerGetterSetter to remove need for getEngine()
2014-04-30 11:17:36 -07:00
Ryan Huffman
65fd2a7724
Merge remote-tracking branch 'upstream/master' into 19612
...
Conflicts:
interface/src/Menu.cpp
2014-04-30 09:57:17 -07:00
Ryan Huffman
0477706cb9
Add ScriptEngine::getEngine() to get internal QScriptEngine
2014-04-30 09:40:32 -07:00
Ryan Huffman
edcff0b67f
Merge remote-tracking branch 'upstream/master' into RunningScripts
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/FramelessDialog.cpp
interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -07:00
Andrew Meadows
c7dbc5984f
add local gravity option parameter for MyAvatar
2014-04-28 16:40:22 -07:00
Andrew Meadows
a7c4b02f2d
merge new work into andrew/inertia
2014-04-28 09:52:06 -07:00
Andrew Meadows
b05a315b5a
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-04-25 14:52:44 -07:00
Andrew Meadows
357aac833e
expose AVATAR_MOTION_OBEY_GRAVITY const to JS
2014-04-25 14:15:40 -07:00
Andrew Meadows
0a7a5031ee
expose COLLISION_GOUP_* constants to JS
2014-04-24 14:17:10 -07:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Atlante45
ddf14b0842
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-22 10:22:30 -07:00
Atlante45
f7f30e118c
More gettimeofday cleanup
2014-04-21 15:17:11 -07:00
Thijs Wenker
70ac93c20d
Style
2014-04-21 21:44:50 +02:00
Thijs Wenker
c016d6557e
- few Adjustments in Application class for Script editor
...
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
Stephen Birarda
75f35c5858
optionally add an AvatarHashMap instance to the ScriptEngine
2014-04-17 17:55:16 -07:00
Andrzej Kapolka
15d4f59ceb
Moved AnimationObject to separate source files.
2014-04-17 15:52:32 -07:00
Andrzej Kapolka
0f69bbe23f
More work on animation loading.
2014-04-16 20:39:55 -07:00
Andrzej Kapolka
8cbad1bf54
More work on animation loading.
2014-04-15 19:37:28 -07:00
Andrzej Kapolka
38c0e99cbe
More work on animation loading.
2014-04-14 18:12:32 -07:00
Clément Brisset
5f6dee6c64
Merge pull request #2635 from thoys/windows-script-path-fix
...
Fixed loading local stored scripts on Windows machines
2014-04-10 16:40:47 -07:00
Thijs Wenker
825acbbd9c
Update ScriptEngine.cpp
...
DWORD is not defined in UNIX based systems. int should be fine
2014-04-10 10:47:21 +02:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Thijs Wenker
5d812c8cb2
Fixed loading local stored scripts on Windows machines
2014-04-09 23:44:40 +02:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Andrew Meadows
23c6873d99
Add Uuid object to ScriptEngine
2014-04-07 14:12:29 -07:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
Mohammed Nafees
d85d4fea5d
Added the new Running Scripts widget
2014-04-02 12:46:57 +05:30
Stephen Birarda
7eab276122
suppress debug in ScriptEngine, fix spatialization from FS head changes
2014-03-26 17:19:23 -07:00
Stephen Birarda
f0f3cf7282
remove seed to random number generator that is no longer needed
2014-03-25 14:36:02 -07:00
Stephen Birarda
f8c479f9c5
seed random number generator in ScriptEngine for Math.random use in JS
2014-03-25 14:28:26 -07:00
ZappoMan
c34b64e296
add load script from URL support
2014-03-25 00:17:19 -07:00
ZappoMan
a613da8032
add Script.include()
2014-03-24 21:25:59 -07:00
ZappoMan
7ef1fe3a74
add support for listing all audio devices and default device in JS
2014-03-24 09:15:03 -07:00
Stephen Birarda
8c4fad443f
allow Agents to microphone audio from Sound objects
2014-03-19 16:14:58 -07:00
Stephen Birarda
7e0da71527
have agent optionally send silent stream flag
2014-03-17 16:38:39 -07:00
Stephen Birarda
3b653ca542
add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291
2014-03-12 17:00:12 -07:00
ZappoMan
f4d487464a
more constructor cleanup
2014-03-09 00:01:47 -08:00
ZappoMan
cfa618d694
cleanup constructors
2014-03-08 23:31:23 -08:00
ZappoMan
15b5bb4385
Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds
...
Conflicts:
examples/bot.js
2014-03-05 02:21:40 -08:00
ZappoMan
374af9eeb5
first cut at flocking birds, change willEmitVisualCallback to update
2014-03-04 14:40:49 -08:00
Atlante45
b854c450f4
Moved LocalVoxels class
2014-02-28 11:25:07 -08:00
Atlante45
b033432684
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
2014-02-27 14:36:44 -08:00
ZappoMan
42ddc82ac4
possible fix to windows assert
2014-02-25 20:23:38 -08:00
Stephen Birarda
bf3b5c07d5
Merge pull request #2093 from ZappoMan/menu_js
...
Adds support for editing application Menus to JS
2014-02-25 17:40:39 -08:00
ZappoMan
3943c49dcc
rename MenuType and other CR feedback
2014-02-25 17:32:16 -08:00
Atlante45
96d4f38e42
Modified the Script engine for Local voxel handling
2014-02-25 16:29:59 -08:00
Stephen Birarda
ee70c93a3e
have scripted avatars send billboard, if they have one
2014-02-25 13:42:07 -08:00
ZappoMan
74d48ab239
added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement
2014-02-25 10:23:59 -08:00
Stephen Birarda
ee9f8937e3
fix a silly typo
2014-02-19 18:03:34 -08:00