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
197ce036c4
Remove debugging line.
2014-04-17 11:06:28 -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
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -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
Stephen Birarda
54647f0f08
make sure gnutls define for ssize_t comes before gnutls include
2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac
add ssize_t definition for gnutls.h include on Windows
2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d
fix GnuTLS include dir variable name
2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e
link to GnuTLS library from script-engine
2014-04-10 10:12:09 -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
Andrew Meadows
22d2f84cff
merge upstream/master into andrew/scripting
2014-04-09 15:38:56 -07: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
Andrew Meadows
5fa1fd6b81
merge
2014-04-09 14:36:22 -07:00
Andrew Meadows
698e3783e0
fixing formatting
2014-04-09 13:06:29 -07:00
Andrew Meadows
f8e66b4e0d
remove cruft
2014-04-09 13:05:26 -07:00
Andrew Meadows
7304049f83
update boiler plate to abide by new standard
2014-04-09 12:55:29 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0
repairs to good code blown away by regex
2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427
prepare header files for regex run against cpp
2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96
fix headers who had their comments removed
2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -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
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
Brad Hefta-Gaub
8f200e917b
fix JS radians vs degrees issues
2014-03-14 13:03:14 -07:00
Stephen Birarda
54d73d4a64
use floor since round is missing on windows
2014-03-12 17:50:58 -07:00
Stephen Birarda
bd6c42a685
define roundf for use on Win from ScriptEngine
2014-03-12 17:32:52 -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
Andrew Meadows
793a760272
merge upstream master into "radians" project
2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -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
1ceb05bf09
click harder
2014-03-08 18:22:30 -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