Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 06:29:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13152 commits 69 branches 58 tags 1.2 GiB
Commit graph

210 commits

Author SHA1 Message Date
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
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
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
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Atlante45
de679b20ad Removed deadlock from merge 2014-03-03 18:48:11 -08:00
Atlante45
357d71e637 Added stuff to localVoxelsExample.js 2014-03-03 17:52:49 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
ZappoMan
8e553c7497 fix potential crash in setIsOptionChecked() added support for positioning separators 2014-03-03 12:03:56 -08:00
Atlante45
af691e1f75 Some comments and debug messages 2014-02-28 15:14:01 -08:00
Atlante45
4a9415faeb Prevent users from modifying the domain tree with the LocalVoxels interface 2014-02-28 11:31:37 -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
Philip Rosedale
b27e9b03d4 removed bad include 2014-02-26 14:15:00 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
ZappoMan
d765e250d5 removed AbstractMenuInterface.h 2014-02-25 20:42:59 -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
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -08:00
ZappoMan
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -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
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78 Adding mouse wheel sizing voxel 2014-02-23 17:26:09 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
ZappoMan
91d79f65f2 fix crash on import from JS 2014-02-19 17:57:28 -08:00
ZappoMan
f6fba54dda improved text mapping in keyboard events 2014-02-19 17:49:00 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
ZappoMan
3bec67ecfd fix right mouse click 2014-02-19 11:42:41 -08:00
ZappoMan
ad8a526502 fix right mouse click 2014-02-19 11:33:43 -08:00
ZappoMan
866b3dbb63 scripting additions 2014-02-18 16:47:50 -08:00
Philip Rosedale
1412d49a2f merge fix 2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b add Vec3::subtract in JS 2014-02-11 15:07:25 -08:00
ZappoMan
1fca763b9d removed whitespace to get build to run 2014-02-11 12:43:48 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
ZappoMan
0c547a8160 added Quat.safeEulerAngles() for JS 2014-02-10 15:37:49 -08:00
ZappoMan
e35df7904b cleanup bad merge 2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29 improvements to rotating gesture detection 2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927 added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties 2014-02-09 12:08:17 -08:00
ZappoMan
9c21eb7949 removed comments 2014-02-09 02:56:26 -08:00
ZappoMan
70c5e674e9 add rotating detection to touch events 2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba add touch event radius 2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
Stephen Birarda
455442088c Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer 2014-02-07 13:45:14 -08:00
ZappoMan
2157349804 added Camera.computePickRay() 2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
ZappoMan
e50f6389ca add more JS Quat features 2014-02-07 00:00:30 -08:00
Stephen Birarda
f10404b31e allow setting of avatar URLs via AvatarData properties 2014-02-06 11:45:37 -08:00
Stephen Birarda
e72f6d16cc rename NodeList ownerUUID to sessionUUID 2014-02-06 11:43:23 -08:00
Stephen Birarda
d563c89482 fix for ScriptEngine crash 2014-02-03 16:25:38 -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
Stephen Birarda
028eec7164 don't allow calls to init, run, evaluate from JS 2014-02-03 10:33:31 -08:00