Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Voip2 #17

Merged
merged 7,655 commits into from
Nov 27, 2017
Merged
Changes from 1 commit
Commits
Show all changes
7655 commits
Select commit Hold shift + click to select a range
b3a9cff
added send peer
Oct 27, 2017
831d601
Add copy button to sprite_frames_editor_plugin
sersoong Oct 27, 2017
5e64115
Fixed interface scaling issues with editor action button and value ed…
larsonjj Oct 28, 2017
9449a34
ProjectSettings: show error msg in a label instead
Oct 28, 2017
297f151
added send text call
Oct 28, 2017
8f2a4cc
Merge pull request #12449 from Noshyaar/ab
Oct 28, 2017
44d4898
Merge pull request #12430 from sersoong/master-test
akien-mga Oct 28, 2017
87dbb71
Merge pull request #12443 from mhilbrunner/appnoname
akien-mga Oct 28, 2017
83f5d7e
Refactor bufer to buffer
Oct 28, 2017
00168e3
Merge pull request #12457 from Noshyaar/buffer
akien-mga Oct 28, 2017
feb30bf
Merge pull request #12448 from larsonjj/fix/property_editor_hidpi
akien-mga Oct 28, 2017
d25357f
kalman filtering
jcalifornia Oct 28, 2017
5f24a0b
Merge pull request #12389 from Chaosus/continuehotkey
akien-mga Oct 28, 2017
c93a3c1
Merge pull request #12396 from AntiSC2/master
cbscribe Oct 28, 2017
e1c930a
fixed kalman
jcalifornia Oct 28, 2017
33daf4d
Detect javascript platform using EMSCRIPTEN env as well
marcelofg55 Oct 28, 2017
24e047f
[DOCS]Completed LineEdit.xml
MattUV Oct 27, 2017
1f356be
added some code to allow it to build on linux, I did pkg-config on os…
hungrymonkey Oct 28, 2017
452313f
BindingsGenerator cleanup and improved error messages
neikeq Oct 29, 2017
55e7289
remove timer from code
Oct 29, 2017
84edb58
Merge pull request #12445 from MattUV/docs-editing
Oct 29, 2017
9f46988
Buildsystem improvements for the Mono module
neikeq Oct 24, 2017
09a1e11
Merge pull request #12388 from neikeq/r
neikeq Oct 29, 2017
27b7fb8
Mono: Add build project button and reload interval
neikeq Oct 29, 2017
8fca54f
Merge pull request #12473 from neikeq/Alpha2?-Let'sDoThis
neikeq Oct 29, 2017
15e3018
Fix regression from #12473 and #12388
neikeq Oct 29, 2017
6ea8ffc
Merge pull request #12474 from neikeq/s
akien-mga Oct 29, 2017
c193286
Merge pull request #12475 from neikeq/ohuiii
akien-mga Oct 29, 2017
d4d12eb
classref: Apply doctool to fix formatting
akien-mga Oct 29, 2017
9f4f630
Merge pull request #12437 from mhilbrunner/astar-setpointweightscale
akien-mga Oct 29, 2017
d3939dc
i18n: Sync translations with Weblate
akien-mga Oct 29, 2017
f327fba
i18n: Sync translation templates with current source
akien-mga Oct 29, 2017
87694d1
Disable logging until the logs location is sorted out
akien-mga Oct 29, 2017
e9d1d64
libpng: Cosmetic update to upstream 1.6.34
akien-mga Oct 29, 2017
23740c8
Mono: Fix Windows build
akien-mga Oct 29, 2017
277e730
Fix typo in project manager
akien-mga Oct 29, 2017
a6d53ef
Fix build with Python 3 on Windows
hoelzl Oct 29, 2017
cb5f2b2
Merge pull request #12485 from hoelzl/pr-python3-build
akien-mga Oct 29, 2017
32502a4
Fixes keybord directionnal keys not moving nodes in the 2D editor
groud Oct 29, 2017
ad8d849
added support for paths with spaces for VSBUILDS
Oct 29, 2017
df0610e
Merge pull request #12490 from nbcks/master
akien-mga Oct 29, 2017
aa5a0b5
Fix FrameworkPathOverride and assemblies path loop
neikeq Oct 29, 2017
619e4eb
Merge pull request #12491 from neikeq/waitasecond···
neikeq Oct 29, 2017
981ef0b
Add support for non-ISO locale identifiers via renames map
akien-mga Oct 29, 2017
9dddce7
Added multi level undo redo to line edit
Paulb23 Oct 29, 2017
8fb223f
Merge pull request #12492 from akien-mga/locale-no
akien-mga Oct 30, 2017
04ec76c
Merge pull request #12495 from Paulb23/line_edit_multi_level_undo
akien-mga Oct 30, 2017
80427c1
Merge pull request #12489 from groud/fix_moving_control_with_directio…
akien-mga Oct 30, 2017
62a3dcd
Merge pull request #12467 from marcelofg55/emscripten_detect
akien-mga Oct 30, 2017
62347e0
Add missing StyleBoxLine binding
sanikoyes Oct 30, 2017
fd89924
Merge pull request #12508 from sanikoyes/pr-missing-StyleBoxLine
akien-mga Oct 30, 2017
b3f5d11
Fix crash when click an empty tabs container
sanikoyes Oct 30, 2017
07d90b0
[DOCS] Added documentation for OccluderPolygon2D
henriiquecampos Oct 29, 2017
be6ac69
Implemented OS get_latin_keyboard_variant on x11
marcelofg55 Oct 30, 2017
60df8db
Merge pull request #12511 from sanikoyes/pr-fix-tabs-crash
akien-mga Oct 30, 2017
1e8c33f
Merge pull request #12484 from pigdevstudio/docs-occluder-polygon-2d
akien-mga Oct 30, 2017
495bcd7
Clean up GI Probe baking, proper button and progress bar.
reduz Oct 30, 2017
9290fd2
Fix 'which' returning file without extension on Windows
neikeq Oct 30, 2017
d55e2d0
Merge pull request #12522 from neikeq/where.exe-is-a-liar
akien-mga Oct 30, 2017
793da07
Fix viewport margins drawn after swapping buffers
RandomShaper Oct 30, 2017
6a11e8c
Merge pull request #12517 from marcelofg55/x11_kbd_variant
akien-mga Oct 30, 2017
7683ff3
Fix get_node() and $ autocompletion when using single quotes
mhilbrunner Oct 28, 2017
4889b80
Merge pull request #12471 from mhilbrunner/autocomplete
akien-mga Oct 30, 2017
e10ee87
Added difference between function which return value or not
wafemand Oct 22, 2017
f3fc072
Add Colemak keybindings to editor for osx
N0hbdy Oct 24, 2017
a6ddc5a
Merge pull request #12363 from groud/implement_guides
akien-mga Oct 30, 2017
4e75397
Merge pull request #12351 from groud/fix_item_list_selection_clipping
akien-mga Oct 30, 2017
b9521f8
Add option to use freelook with a toggle shortcut (like Blender) inst…
Zylann Oct 30, 2017
5bbc9a7
Merge pull request #12268 from AlexHolly/fix-lineedit-selection
akien-mga Oct 30, 2017
4785e66
Merge pull request #12288 from tagcup/expose_viewport_size
reduz Oct 30, 2017
ad194f8
Remove Visual Studio for now from the external editors list
neikeq Oct 30, 2017
fd07a28
Merge pull request #12523 from RandomShaper/fix-margins-drawn-too-late
reduz Oct 30, 2017
f021b00
Merge pull request #12525 from neikeq/wololo
akien-mga Oct 30, 2017
6e68c86
Add viewport to the other SceneData struct.
tagcup Oct 31, 2017
d582cab
Merge pull request #12526 from tagcup/ubo_fix
reduz Oct 31, 2017
31a4876
Merge pull request #12499 from Zylann/freelook_toggle_mode
akien-mga Oct 31, 2017
2b82997
Use node name as default filename when attaching script.
Nallebeorn Oct 24, 2017
91adb58
Add screenshot to the README
akien-mga Oct 31, 2017
a1ffadb
Revert "Fixes the selection rect in item_list drawn not clipped"
akien-mga Oct 31, 2017
31cd46f
Merge pull request #12530 from godotengine/revert-12351-fix_item_list…
akien-mga Oct 31, 2017
bb6dc76
Fixed GitHub detection of license in LICENSE.txt file.
uldall Oct 31, 2017
a9a49b8
Merge pull request #12531 from uldall/master
akien-mga Oct 31, 2017
32ee3ec
Fix msbuild hint paths returning only the directory
neikeq Oct 31, 2017
2d5de0b
Reorder EditorSettings code for better legibility
akien-mga Oct 28, 2017
157fa55
Merge pull request #12535 from neikeq/wtf···
neikeq Oct 31, 2017
f3218c2
Mono: support custom script templates.
27thLiz Oct 30, 2017
16327bf
Improved WASAPI driver logic when devices are connected or disconnected
marcelofg55 Oct 31, 2017
a7feec3
Clear text when a new action is added Project Settings Input Map
bncastle Oct 31, 2017
a4ea637
Ability to shrink 3D viewport by half
reduz Oct 31, 2017
e03a054
Remove text on enter, issue 12494
Paulb23 Oct 31, 2017
ca31174
Merge pull request #10261 from Cradmon/refactor
akien-mga Oct 31, 2017
24b3733
Merge pull request #10770 from RandomShaper/fix-joints
akien-mga Oct 31, 2017
cb3f594
Merge pull request #11249 from m4nu3lf/bugfix/get_euler
akien-mga Oct 31, 2017
ea0e942
Merge pull request #12035 from Chaosus/wrapfunc
akien-mga Oct 31, 2017
2ffcbae
Merge pull request #12536 from Hinsbart/cs_templates
akien-mga Oct 31, 2017
31c92c5
Merge pull request #12537 from marcelofg55/wasapi_improvements
akien-mga Oct 31, 2017
0438f48
Some more harmonization of EditorSettings code
akien-mga Oct 31, 2017
63adc9f
Merge pull request #12539 from bncastle/InputMapDialogClearAction
akien-mga Oct 31, 2017
29ea79e
Merge pull request #12542 from Paulb23/enter_remove_text_issue_12494
akien-mga Oct 31, 2017
0525b63
Use mono_gc_wbarrier_set_arrayref for Array marshalling
neikeq Oct 31, 2017
0804dd5
Added String::dedent() to remove text indentation
leezh Oct 11, 2017
dbf774f
Proofreading: Change a usage of "specially" to "especially"
cooperra Oct 31, 2017
ef90965
Restores functionality of the use_compression flag in the Collada imp…
SaracenOne Nov 1, 2017
06ea441
Make sure gchandle bindings are released before cleanup
neikeq Nov 1, 2017
a018cba
Fix thread checking to queue instances for deletion
neikeq Nov 1, 2017
cb3ef3c
Merge pull request #12546 from neikeq/do-people-read-these
neikeq Nov 1, 2017
3c97a95
Merge pull request #12549 from neikeq/seriously-do-they
neikeq Nov 1, 2017
7a5594b
Merge pull request #12547 from cooperra/specially-vs-especially
Nov 1, 2017
f8ed114
Merge pull request #12025 from leezh/dedent
akien-mga Nov 1, 2017
fc6ef93
Merge pull request #12548 from SaracenOne/vertex_compression_import_fix
akien-mga Nov 1, 2017
5888910
Merge pull request #12538 from akien-mga/editorsettings
akien-mga Nov 1, 2017
93e8468
Fix to issue #12554, due to error in refactoring in PR #10261
Cradmon Nov 1, 2017
584bc88
Merge pull request #12559 from Cradmon/filesystemDockFix
akien-mga Nov 1, 2017
167b7b5
Adding rumble support to ARVR controllers (if implemented on the ARVR…
BastiaanOlij Nov 1, 2017
025f138
Merge pull request #10618 from poke1024/polygon2d-selection
groud Nov 1, 2017
95408c8
Select correct animation on creation of a new one
bncastle Nov 1, 2017
1d99f93
Fix compilation on Visual Studio 2013 again.
Nov 1, 2017
93a3d17
Merge pull request #12568 from starry-abyss/vs2013_fix
akien-mga Nov 1, 2017
6ba94cb
Fixed RichTextLabel::add_newline() #12564
leezh Nov 2, 2017
79f81b7
-Modules can now add custom version info (added it for Mono)
reduz Nov 2, 2017
4b47726
Merge pull request #12575 from leezh/richtext_newline_fix
akien-mga Nov 2, 2017
02382c4
Fixed AnimationPlayer.get_autoplay() returning empty string
Keetz Nov 2, 2017
51b7fd9
Merge pull request #12577 from Keetz/master
akien-mga Nov 2, 2017
cefdb34
SCons: make use_lto a global option and opt-in for iphone
akien-mga Nov 2, 2017
c880302
Merge pull request #12566 from bncastle/select_anim_fix
akien-mga Nov 2, 2017
38d56c8
make ConfigFile use OrderedHashMap
karroffel Nov 3, 2017
8e145fa
Merge pull request #12608 from karroffel/configfile-orderedhashmap
karroffel Nov 3, 2017
8b11e17
[GDNative] small API bug fixes
karroffel Nov 3, 2017
af5c6be
[GDNative] added Read and Write accessors to pool arrays
karroffel Nov 3, 2017
acd193b
Merge pull request #12610 from karroffel/gdnative-api-fixes
akien-mga Nov 3, 2017
25c38c7
Merge pull request #12557 from BastiaanOlij/arvr_add_rumble_support
BastiaanOlij Nov 3, 2017
7a9ca08
Implemented physics plug
AndreaCatania Oct 21, 2017
7715a26
Merge pull request #12262 from AndreaCatania/pplug
reduz Nov 4, 2017
4c79e58
AStar: implementation of get_point_connections
lmcdd Nov 2, 2017
9aebdd2
Merge pull request #12593 from DmDerbin/master
Nov 4, 2017
1386647
make ConfigFile sections ordered
karroffel Nov 4, 2017
8c6cc4d
Docs cosmetics: add more space to Signals, Enumerations, Constants;
poke1024 Nov 4, 2017
3cbcf5c
Merge pull request #12612 from karroffel/gdnative-poolarray-accessors
karroffel Nov 4, 2017
bd41cb1
Docs for wrap functions
Chaosus Nov 4, 2017
a8012f1
Fixes random sorting order in Create New Node dialog
poke1024 Nov 4, 2017
40acb85
Change URL of the mirror list
bojidar-bg Nov 4, 2017
ed04726
Vendor thirdparty Bullet source for upcoming physics server backend
AndreaCatania Aug 1, 2017
8f204d7
In Create New Node, always select and show best (shortest) match
poke1024 Nov 4, 2017
88007e9
Use AbstractPolygon2DEditor for Line2D
poke1024 Nov 4, 2017
fb4871c
Bullet physics engine implementation
AndreaCatania Nov 4, 2017
efb795b
Merge pull request #12630 from karroffel/configfile-orderedhashmap
karroffel Nov 4, 2017
8e2a756
Added for fallback msbuild.exe.
Nov 4, 2017
609cf36
Fixed dedent() binding did not return result
leezh Nov 5, 2017
f7a41c1
Merge pull request #12647 from leezh/dedent_return
Nov 5, 2017
7ec32b6
Basic docs for Geometry plus two new functions
poke1024 Nov 4, 2017
a89fa34
Merge pull request #12641 from AndreaCatania/bullet
akien-mga Nov 5, 2017
5bc2cf2
Convert DOS line endings to Unix line endings
akien-mga Nov 5, 2017
a7304b0
Fix selection and clicks on text in tables in RichTextLabel
poke1024 Nov 5, 2017
e5c3e3b
Merge pull request #12638 from poke1024/fixcreate
akien-mga Nov 5, 2017
3149ef0
Merge pull request #12639 from bojidar-bg/x-add-rest-template-listing
akien-mga Nov 5, 2017
a0ac080
Merge pull request #12640 from poke1024/createnode-ui
akien-mga Nov 5, 2017
9a78efc
Merge pull request #12642 from BrainBlasted/fix_msbuild_unix
akien-mga Nov 5, 2017
c937b1f
make Dictionary use OrderedHashMap
karroffel Nov 5, 2017
6f6afde
Changed line and word mouse selection
Paulb23 Nov 5, 2017
2c69f3d
Bullet - Added support to multiple spaces
AndreaCatania Nov 5, 2017
fec243e
Added filter_clip to AtlasTexture
mrcdk Nov 5, 2017
1a5d3c2
Fix WebAudio and HTML5 build
leonkrause Nov 4, 2017
b6db049
Merge pull request #12646 from poke1024/geomdocs
Nov 6, 2017
5ceaae5
Merge pull request #12636 from Chaosus/wrapdocs
Nov 6, 2017
d37d4ae
Merge pull request #12631 from poke1024/docspolish
Nov 6, 2017
7376798
Merge pull request #12635 from poke1024/line2d-poly-editor
Nov 6, 2017
e20241c
Merge pull request #12691 from eska014/webaudio
akien-mga Nov 6, 2017
d4e37ef
Merge pull request #12662 from Paulb23/text_edit_mouse_selection
akien-mga Nov 6, 2017
386ec5d
Merge pull request #12653 from poke1024/fixdocsclick
akien-mga Nov 6, 2017
802a422
Merge pull request #12658 from AndreaCatania/bullet
akien-mga Nov 6, 2017
00ce629
Prevent to stop music in another background app on iOS
volzhs Nov 6, 2017
ec31b23
add support for Android NDK unified headers
rraallvv Oct 31, 2017
610c7f8
Merge pull request #12698 from volzhs/dont-stop-music-master
akien-mga Nov 6, 2017
32dfdc1
Merge pull request #12656 from karroffel/dictionary-ordered-hashmap
akien-mga Nov 6, 2017
faf21d8
Merge pull request #12684 from mrcdk/atlastextures_fix
akien-mga Nov 6, 2017
9437db7
Merge pull request #12604 from rraallvv/unified_headers
akien-mga Nov 6, 2017
eaa8c46
Fix randomisation of initial particle velocity
MillionOstrich Nov 6, 2017
b279f64
Remove performance warnings, closes #11585
reduz Nov 7, 2017
0781649
Add menu to import current editor theme into theme editor
Geequlim Nov 7, 2017
10f879b
Rewritten kinematic system
AndreaCatania Nov 7, 2017
a2e09a5
[GDNative] even more API fixes
karroffel Nov 7, 2017
5f110c5
Fixed collision exception - #12681
AndreaCatania Nov 7, 2017
af5708e
Fixed invalid license symbol
Chaosus Nov 7, 2017
d5b7df8
Use UTF-8 for locale names. Fixes #12462.
mhilbrunner Nov 7, 2017
487afde
Ignore files not ending with '.xml' when building doc header
mhilbrunner Nov 7, 2017
1bf132f
Merge pull request #12729 from Chaosus/fixlicensesymbol
Nov 7, 2017
d4b19d8
Merge pull request #12730 from mhilbrunner/unicode
Nov 7, 2017
2965eb2
Fix has_gyro and has_grav mixup
BastiaanOlij Nov 8, 2017
c755b68
Editor: Update 2D viewport and inspector selection on delete. Fix #12…
mhilbrunner Nov 8, 2017
a897be5
[DOCS] OS.get_unique_string().
mhilbrunner Nov 8, 2017
706431b
Merge pull request #12724 from AndreaCatania/bullet
akien-mga Nov 8, 2017
0095d64
Merge pull request #11379 from m4nu3lf/feature/no_bias_overrotation
akien-mga Nov 8, 2017
ec77ccc
Merge pull request #12734 from BastiaanOlij/mobilevr_fix_typo
akien-mga Nov 8, 2017
2a230d5
Increase joystick axis from 8 to 10
BastiaanOlij Nov 8, 2017
1821915
Merge pull request #12735 from mhilbrunner/delete-clearselect
akien-mga Nov 8, 2017
09abcc7
Merge pull request #12739 from mhilbrunner/patch-1
akien-mga Nov 8, 2017
3062043
Merge pull request #12743 from BastiaanOlij/increase_joystick_maxaxis
Nov 8, 2017
7b26b3b
Merge pull request #12731 from mhilbrunner/issue-12584
akien-mga Nov 8, 2017
e44408f
Compile Android with STL enabled by default
AndreaCatania Nov 8, 2017
2cdfef5
Merge pull request #12744 from AndreaCatania/patch-1
akien-mga Nov 8, 2017
7734591
Merge pull request #12725 from karroffel/gdnative-api-fixes
akien-mga Nov 8, 2017
b5e8cd3
Merge pull request #12718 from GodotExplorer/export-editor-theme
akien-mga Nov 8, 2017
5fb359d
Merge pull request #12706 from MillionOstrich/particle-random-velocity
akien-mga Nov 8, 2017
4045bc1
Fix "Invalid outputs" error when calling a void method from visual sc…
bojidar-bg Nov 8, 2017
b7fd065
Fix crash when guessing type of variable declared to itself
bojidar-bg Nov 8, 2017
0b7ae36
Fix tilemap undo/redo
Zylann Nov 8, 2017
b37e277
Fixing bad index used in Space2DSW
MateusMP Nov 8, 2017
09a1d01
[DOCS] Object
NathanWarden Nov 7, 2017
b87a7df
Merge pull request #12733 from NathanWarden/document_object
cbscribe Nov 9, 2017
7e0e415
Merge pull request #12755 from Zylann/fix_tilemap_undo
akien-mga Nov 9, 2017
355c8fd
Merge pull request #12752 from bojidar-bg/10972-recusion-completion
akien-mga Nov 9, 2017
5f805de
Merge pull request #12751 from bojidar-bg/11851-invalid-returns-count
akien-mga Nov 9, 2017
05fc741
Merge pull request #12757 from MateusMP/bugfix/11695
akien-mga Nov 9, 2017
7664a0f
unified headers fix
rraallvv Nov 8, 2017
e25b6bf
fix dictionary constant access crash
karroffel Nov 7, 2017
c7cd89c
Merge pull request #12780 from karroffel/dictionary-crash
akien-mga Nov 9, 2017
423f299
Enable asset store for godot 3.0
Chaosus Nov 9, 2017
d7add01
Merge pull request #12778 from Chaosus/enableassetstore
akien-mga Nov 9, 2017
e4effb4
Merge pull request #12746 from rraallvv/unified_headers_fix
akien-mga Nov 9, 2017
7957bbf
add missing distutils.version.LooseVersion import
rraallvv Nov 9, 2017
d09160a
Make video mode initialization more intuitive, fixes #12022
reduz Nov 9, 2017
2507818
Merge pull request #12782 from rraallvv/unified_headers_fix
akien-mga Nov 9, 2017
5cb1d06
fixes to initialization order
reduz Nov 9, 2017
38ae49e
Make sure we don't leak when an opcode is followed by itself
hpvb Nov 9, 2017
983404e
[GDNative] refactored API struct into core and extensions
karroffel Nov 9, 2017
a607e61
Fix crash when converting empty scene to TileSet
Nov 7, 2017
a3387a9
UWP: Update to build with Windows SDK 10.16229.0
vnen Nov 9, 2017
c179db2
Merge pull request #12787 from vnen/uwp-vs2017
akien-mga Nov 9, 2017
881defa
Merge pull request #12784 from hpvb/fix-12401
akien-mga Nov 9, 2017
b42011d
Merge remote-tracking branch 'upstream/master' into rdrr_master
jcalifornia Nov 9, 2017
a32adbe
Merge pull request #13 from hungrymonkey/custom_proto
jcalifornia Nov 9, 2017
50a9bd4
Merge pull request #12713 from AndreaCatania/master
reduz Nov 9, 2017
0416ca2
Add slope min stop velocity on 3D physics body, closes #10981
reduz Nov 9, 2017
9e6f974
adjust min stop to horizontal velocity
reduz Nov 9, 2017
ed57f0a
Remove get_default_video_mode definition on OSX/iOS
akien-mga Nov 9, 2017
0de6cba
Merge pull request #12779 from karroffel/gdnative-api-struct-refactor
akien-mga Nov 9, 2017
e6cee15
Merge remote-tracking branch 'upstream/master' into rdrr_master
jcalifornia Nov 10, 2017
d7cedfd
have to test the new mic module
Nov 12, 2017
425cf72
added audiostreamresampled
Nov 13, 2017
31c5243
added basic voip skeleton code
Nov 13, 2017
ff6e304
added untested decode opus
Nov 13, 2017
4e2dfc8
remove redundent packet len because enet already has it
Nov 13, 2017
160266c
crashes due to race condition get_16
Nov 13, 2017
416eba8
client is talking to host with complete random noise
Nov 13, 2017
5e12dbd
seems like the encoded increase the bass of the voip
Nov 14, 2017
d694ee0
sending packets from host is broken
Nov 14, 2017
da89f1b
seems to be working
Nov 14, 2017
f725e63
added back the libogg
Nov 14, 2017
0b8ad70
change to dynamic and change to mutex
Nov 16, 2017
869bc67
minor cleanups:
Nov 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
have to test the new mic module
hungrymonkey authored and hungrymonkey committed Nov 12, 2017
commit d7cedfd23e750e5984fc6f194a7bbf2cdd19c72d
1 change: 1 addition & 0 deletions modules/talkingtree/config.py
Original file line number Diff line number Diff line change
@@ -4,5 +4,6 @@ def can_build(platform):
return True

def configure(env):
env.ParseConfig('pkg-config sdl2 --cflags --libs')
env.Append(LIBS=['protobuf'])
pass
12 changes: 10 additions & 2 deletions modules/talkingtree/register_types.cpp
Original file line number Diff line number Diff line change
@@ -4,11 +4,19 @@
#include "register_types.h"
#include "class_db.h"
#include "talking_tree.h"
#include "sdl2_audiocapture.h"

static SDL2AudioCapture *SDL2_audio_capture = NULL;

void register_talkingtree_types() {
ClassDB::register_class<TalkingTree>();
ClassDB::register_class<TalkingTree>();
//ClassDB::register_class<SDL2AudioCapture>();
SDL2_audio_capture = memnew(SDL2AudioCapture);
SDL2_audio_capture->init();
SDL2_audio_capture->set_singleton();
}

void unregister_talkingtree_types() {
//nothing to do here
//nothing to do here
SDL2_audio_capture->finish();
}
101 changes: 101 additions & 0 deletions modules/talkingtree/sdl2_audiocapture.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
#include "sdl2_audiocapture.h"
#include "os/os.h"


SDL2AudioCapture *SDL2AudioCapture::singleton = NULL;
SDL2AudioCapture *SDL2AudioCapture::get_singleton() {
return singleton;
}
void SDL2AudioCapture::thread_func(void *p_udata){
SDL2AudioCapture *ac = (SDL2AudioCapture *) p_udata;

uint64_t usdelay = 16000;
while(!ac -> exit_thread){
if(ac->recording()){
ac->lock();
int frames = ac->get_available_frames();
int16_t buf[SDL2AudioCapture::FRAME_SIZE];
PoolVector<uint8_t> pcm;
pcm.resize(sizeof(buf));
for(int i = 0; i < frames; i++){
uint32_t bytes = SDL_DequeueAudio( ac->devid_in, buf, SDL2AudioCapture::FRAME_SIZE*2);
PoolVector<uint8_t>::Write w = pcm.write();
copymem(w.ptr(), buf, sizeof(buf));
ac->emit_signal("get_pcm", pcm);
}
ac->unlock();
}
OS::get_singleton()->delay_usec(usdelay);
}
}
void SDL2AudioCapture::set_singleton() {
singleton = this;
}
void SDL2AudioCapture::_bind_methods() {
ADD_SIGNAL(MethodInfo("get_pcm", PropertyInfo(Variant::POOL_BYTE_ARRAY, "audio_frame")));
}
Error SDL2AudioCapture::init(){
if(SDL_Init(SDL_INIT_AUDIO) < 0){
ERR_PRINTS("Couldn't initialize SDL: " + String(SDL_GetError()));
}

wanted.freq = SDL2AudioCapture::SAMPLE_RATE;
wanted.format = AUDIO_S16SYS;
wanted.channels = 1;
wanted.samples = SDL2AudioCapture::FRAME_SIZE;
wanted.callback = NULL;
devid_in = SDL_OpenAudioDevice(NULL, SDL_TRUE, &wanted, &wanted, 0);
if (!devid_in) {
ERR_PRINTS("Couldn't open an audio device for capture: " + String(SDL_GetError()));
}

thread_exited = false;
mutex = Mutex::create();
thread = Thread::create(SDL2AudioCapture::thread_func, this);
return OK;
}
void SDL2AudioCapture::talk(){
SDL_PauseAudioDevice(devid_in, SDL_FALSE);
}
bool SDL2AudioCapture::recording(){
return SDL_GetAudioDeviceStatus(devid_in) == SDL_AUDIO_PLAYING;
}
int SDL2AudioCapture::get_available_frames() const {
return SDL_GetQueuedAudioSize(devid_in)/SDL2AudioCapture::FRAME_SIZE/2;
}
void SDL2AudioCapture::mute(){
SDL_PauseAudioDevice(devid_in, SDL_TRUE);
SDL_ClearQueuedAudio(devid_in);
}
void SDL2AudioCapture::lock() {
if (!thread || !mutex)
return;
mutex->lock();
}

void SDL2AudioCapture::unlock() {

if (!thread || !mutex)
return;
mutex->unlock();
}
void SDL2AudioCapture::finish() {

if (!thread)
return;

exit_thread = true;
Thread::wait_to_finish(thread);

SDL_PauseAudioDevice(devid_in, SDL_TRUE);
SDL_CloseAudioDevice(devid_in);
memdelete(thread);
if (mutex)
memdelete(mutex);
thread = NULL;
}
SDL2AudioCapture::SDL2AudioCapture() {

mutex = NULL;
thread = NULL;
}
47 changes: 47 additions & 0 deletions modules/talkingtree/sdl2_audiocapture.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#ifndef SDL2_AUDIOCAPTURE_H
#define SDL2_AUDIOCAPTURE_H

#include "object.h"
#include "variant.h"
#include "core/os/thread.h"
#include "core/os/mutex.h"
#include <SDL.h>
class SDL2AudioCapture : public Object {
GDCLASS(SDL2AudioCapture, Object);

static SDL2AudioCapture *singleton;
static void thread_func(void *p_udata);
public:
static SDL2AudioCapture *get_singleton();

private:
enum{
SAMPLE_RATE = 48000,
FRAME_SIZE = 960,
};
bool thread_exited;
mutable bool exit_thread;
Thread *thread;
Mutex *mutex;
SDL_AudioDeviceID devid_in;
SDL_AudioSpec wanted;
int get_available_frames() const;
protected:
static void _bind_methods();
public:
enum Format {
FORMAT_8_BIT,
FORMAT_16_BIT,
};
void set_singleton();
void lock();
void unlock();
void talk();
void mute();
bool recording();
void finish();
Error init();
SDL2AudioCapture();
};
VARIANT_ENUM_CAST(SDL2AudioCapture::Format);
#endif SDL2_AUDIOCAPTURE_H
128 changes: 64 additions & 64 deletions modules/talkingtree/varint.cpp
Original file line number Diff line number Diff line change
@@ -12,71 +12,71 @@ VarInt::VarInt(Vector<uint8_t> encoded) : value(parseVariant(encoded.ptr())) { }
*/

int64_t VarInt::parseVariant(uint8_t *buffer) {
int64_t v = buffer[0];
if ((v & 0x80) == 0x00) {
return (v & 0x7F);
} else if ((v & 0xC0) == 0x80) {
return (v & 0x3F) << 8 | buffer[1];
} else if ((v & 0xF0) == 0xF0) {
switch (v & 0xFC) {
case 0xF0:
return buffer[1] << 24 | buffer[2] << 16 | buffer[3] << 8 | buffer[4];
case 0xF4:
ERR_PRINT("currently unsupported 8-byte varint size");
case 0xF8:
case 0xFC:
ERR_PRINT("currently negative varints aren't supported");
default:
break;
}
} else if ((v & 0xF0) == 0xE0) {
return (v & 0x0F) << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3];
} else if ((v & 0xE0) == 0xC0) {
return (v & 0x1F) << 16 | buffer[1] << 8 | buffer[2];
}
ERR_PRINT("invalid varint");
int64_t v = buffer[0];
if ((v & 0x80) == 0x00) {
return (v & 0x7F);
} else if ((v & 0xC0) == 0x80) {
return (v & 0x3F) << 8 | buffer[1];
} else if ((v & 0xF0) == 0xF0) {
switch (v & 0xFC) {
case 0xF0:
return buffer[1] << 24 | buffer[2] << 16 | buffer[3] << 8 | buffer[4];
case 0xF4:
ERR_PRINT("currently unsupported 8-byte varint size");
case 0xF8:
case 0xFC:
ERR_PRINT("currently negative varints aren't supported");
default:
break;
}
} else if ((v & 0xF0) == 0xE0) {
return (v & 0x0F) << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3];
} else if ((v & 0xE0) == 0xC0) {
return (v & 0x1F) << 16 | buffer[1] << 8 | buffer[2];
}
ERR_PRINT("invalid varint");
}

Vector<uint8_t> VarInt::getEncoded() const {
Vector<uint8_t> encoded;
int64_t i = this->value;
if ((i & 0x8000000000000000LL) && (~i < 0x100000000LL)) {
i = ~i;
if (i <= 0x3) {
encoded.push_back(0xFC | i);
return encoded;
} else {
encoded.push_back(0xF8);
}
}
if (i < 0x80) {
encoded.push_back(i);
} else if (i < 0x4000) {
encoded.push_back(0x80 | (i >> 8));
encoded.push_back(i & 0xFF);
} else if (i < 0x200000) {
encoded.push_back(0xC0 | (i >> 16));
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
} else if (i < 0x10000000) {
encoded.push_back(0xE0 | (i >> 24));
encoded.push_back((i >> 16) & 0xFF);
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
} else {
encoded.push_back(0xF4);
encoded.push_back((i >> 56) & 0xFF);
encoded.push_back((i >> 48) & 0xFF);
encoded.push_back((i >> 40) & 0xFF);
encoded.push_back((i >> 32) & 0xFF);
encoded.push_back((i >> 24) & 0xFF);
encoded.push_back((i >> 16) & 0xFF);
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
}
return encoded;
Vector<uint8_t> encoded;
int64_t i = this->value;
if ((i & 0x8000000000000000LL) && (~i < 0x100000000LL)) {
i = ~i;
if (i <= 0x3) {
encoded.push_back(0xFC | i);
return encoded;
} else {
encoded.push_back(0xF8);
}
}
if (i < 0x80) {
encoded.push_back(i);
} else if (i < 0x4000) {
encoded.push_back(0x80 | (i >> 8));
encoded.push_back(i & 0xFF);
} else if (i < 0x200000) {
encoded.push_back(0xC0 | (i >> 16));
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
} else if (i < 0x10000000) {
encoded.push_back(0xE0 | (i >> 24));
encoded.push_back((i >> 16) & 0xFF);
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
} else {
encoded.push_back(0xF4);
encoded.push_back((i >> 56) & 0xFF);
encoded.push_back((i >> 48) & 0xFF);
encoded.push_back((i >> 40) & 0xFF);
encoded.push_back((i >> 32) & 0xFF);
encoded.push_back((i >> 24) & 0xFF);
encoded.push_back((i >> 16) & 0xFF);
encoded.push_back((i >> 8) & 0xFF);
encoded.push_back(i & 0xFF);
}
return encoded;
}
36 changes: 18 additions & 18 deletions modules/talkingtree/varint.h
Original file line number Diff line number Diff line change
@@ -3,23 +3,23 @@


class VarInt : public Reference {
GDCLASS(VarInt,Reference);
GDCLASS(VarInt,Reference);

public:
VarInt(uint8_t *encoded);
VarInt(Vector<uint8_t> encoded);
VarInt(int64_t value);
int64_t getValue() const {
return this->value;
}
Vector<uint8_t> getEncoded() const;
private:
const int64_t value;
int64_t parseVariant(uint8_t *buffer);
public:
VarInt(uint8_t *encoded);
VarInt(Vector<uint8_t> encoded);
VarInt(int64_t value);
int64_t getValue() const {
return this->value;
}
Vector<uint8_t> getEncoded() const;
private:
const int64_t value;
int64_t parseVariant(uint8_t *buffer);
};