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 |
|