mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,610 Commits 15 Branches 59 Tags 8.1 GiB
fd6a98b753
Commit Graph

12610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
fb0cd802c4
Merge pull request #15773 from endragor/android-gdnative-remote-fs 
Make remote FS work with GDNative on Android
 2018-01-16 22:26:27 +01:00
Rémi Verschelde
898e997927
Merge pull request #15786 from Chaosus/fixbuiltinfuncparamnames 
Fixes for parameter names of builtin functions in visual scripts/core
 2018-01-16 22:26:16 +01:00
Juan Linietsky
4de84f4c0a BMFont loading direct support from .fnt files. 2018-01-16 17:58:04 -03:00
Chaosus
0c9312c6b8 Fixes for parameter names of builtin functions in visual scripts/core 2018-01-16 19:49:45 +03:00
Rémi Verschelde
1968cc445c
Merge pull request #15777 from AndreaCatania/p2 
Fixed bullet physics body shape scaling
 2018-01-16 13:08:13 +01:00
AndreaCatania
ecfe932eb8 Fixed bullet physics body shape scaling 2018-01-16 12:53:01 +01:00
Rémi Verschelde
3def642a15
Merge pull request #15772 from godotengine/revert-15540-fix_color_to_html 
Revert "Fix bad color to HTML conversion. Alpha channel was added before RGB."
 2018-01-16 10:23:15 +01:00
Rémi Verschelde
09ca100658
Revert "Fix bad color to HTML conversion. Alpha channel was added before RGB." 2018-01-16 10:22:22 +01:00
Ruslan Mustakov
99f93ea440 Make remote FS work with GDNative on Android 
.so files are added to the .apk when remote FS is used.
 2018-01-16 15:18:47 +07:00
Rémi Verschelde
b6f88dae87
Merge pull request #15762 from YeldhamDev/globalscope_javascript 
[DOCS] Description for the JavaScript singleton in @GlobalScope.
 2018-01-16 07:41:00 +01:00
Emmanuel Leblond
0de61998e4
Improve inheritance system in gdnative pluginscript 2018-01-16 00:23:27 +01:00
Michael Alexsander Silva Dias
0dce89c862 [DOCS] Description for the JavaScript singleton in @GlobalScope. 2018-01-15 21:15:04 -02:00
Rémi Verschelde
14b230f35f
Merge pull request #15760 from eska014/es3-copy-shader 
Fix copy shader in GLSL ES 3.0
 2018-01-16 00:01:53 +01:00
Leon Krause
cbc194dde6 Fix copy shader in GLSL ES 3.0 2018-01-15 23:46:45 +01:00
Juan Linietsky
03475ba197 Filled tutorial field in most relevent classes. 
Added tutorial display in doc.
 2018-01-15 18:41:13 -03:00
K. S. Ernest (iFire) Lee
ef1c26a9a5 Make sure PropertyHint matches in the VisualScript editor. 2018-01-15 22:19:54 +01:00
Rémi Verschelde
8dc1c0bda5
Merge pull request #15755 from eska014/webgl-particles2d 
Fix Particles2D in WebGL 2.0
 2018-01-15 22:06:07 +01:00
Leon Krause
e4609acc5d Fix Particles2D in WebGL 2.0 2018-01-15 20:39:17 +01:00
Rémi Verschelde
d6caf32675
Merge pull request #15701 from groud/changes_default_keep_margin_to_true 
Changes the keep_margin parameter to true by default
 2018-01-15 20:32:18 +01:00
Rémi Verschelde
700a1a9096
Merge pull request #15724 from karroffel/gdnative-fix-some-crashes 
[GDNative] fix two crashes with NativeScript
 2018-01-15 20:18:50 +01:00
Rémi Verschelde
089dcc6959
Merge pull request #15752 from Hinsbart/propselect 
PropertyEditor: Add missing MAKE_PROPSELECT.
 2018-01-15 19:51:47 +01:00
Andreas Haas
122837e73a
PropertyEditor: Add missing MAKE_PROPSELECT. 
Fixes #15745
 2018-01-15 19:43:32 +01:00
Gilles Roudiere
b06c6602c8 Changes the keep_margin parameter to true by default, so that people are not suprised that set_anchor changes the margins values 2018-01-15 10:37:13 +01:00
Rémi Verschelde
05b1843818
Merge pull request #15696 from bojidar-bg/15646-assigned-animation 
Fix an issue with the animation editor not seeking to the target time
 2018-01-15 08:54:07 +01:00
Rémi Verschelde
cd62fd48f9
Merge pull request #15728 from Zylann/fix_freelook_null_shortcut 
Fix crash when freelook shortcuts are undefined
 2018-01-15 07:40:25 +01:00
Rémi Verschelde
b68a972971
Merge pull request #15712 from Faless/viewport_input 
ViewportContainer passes input down to children viewports
 2018-01-15 07:39:17 +01:00
Fabio Alessandrelli
765051e104 ViewportContainer passes input down to children viewports 2018-01-15 00:36:57 +01:00
Marc Gilleron
6a4e89b6ec Fix crash when freelook shortcuts are undefined 2018-01-15 00:32:27 +01:00
karroffel
d56bcc38ac [GDNative] fix two crashes with NativeScript 2018-01-14 23:39:10 +01:00
Rémi Verschelde
0a691bf29e
Merge pull request #15671 from Calinou/non-tty-simple-build-log 
Disable colored output and progress bar when building outside of a TTY
 2018-01-14 22:48:47 +01:00
George Marques
109242c011
Merge pull request #15709 from Paulb23/update_member_keyword_colour_on_change 
Fixed member keywords colour not updating on settings change
 2018-01-14 14:44:57 -02:00
Paulb23
896a0c5ef5 Fixed member keywords colour not updating on settings change 2018-01-14 16:31:46 +00:00
Rémi Verschelde
a1a67e6e84
Merge pull request #15708 from Paulb23/current_line_clipping_issue_15427 
Fixed current line highlighting with horizontal clipping, issue 15427
 2018-01-14 17:22:09 +01:00
Paulb23
386c57cfad Fixed current line highligting with horizontal clipping, issue 15427 2018-01-14 16:06:27 +00:00
Rémi Verschelde
515da5b08b
Merge pull request #15706 from groud/remove_unused_class 
Remove the unused FindReplaceDialog class
 2018-01-14 16:57:27 +01:00
Gilles Roudiere
c318cdad66 Remove the unused FindReplaceDialog class 2018-01-14 16:23:01 +01:00
Rémi Verschelde
f96f11c850
Merge pull request #15699 from poke1024/fix15024 
Fix external editors always opening on scene change
 2018-01-14 15:15:59 +01:00
Bernhard Liebl
89057dd289 Fix external editors always opening on scene change 2018-01-14 12:34:00 +01:00
Bojidar Marinov
f2355949c4
Fix an issue with the animation editor not seeking to the target time properly. 
Fixes #15646.
 2018-01-14 12:28:57 +02:00
Thomas Herzog
859ac6233d
Merge pull request #15684 from karroffel/nativescript-windows-editor-crash 
[GDNative] fix editor crash with NativeScript
 2018-01-14 01:40:48 +01:00
karroffel
567d20fe5f [GDNative] fix editor crash with NativeScript 2018-01-14 01:01:35 +01:00
Rémi Verschelde
6a4521da2a
Merge pull request #15679 from bruvzg/fix_itos_on_int64_min 
Fix String::itos/String::num_int64(INT64_MIN) output.
 2018-01-13 21:25:43 +01:00
Rémi Verschelde
e15ee649b8
Merge pull request #15680 from karroffel/gdnative-api-hash-cache 
[GDNative] cache API hashes
 2018-01-13 21:25:26 +01:00
karroffel
ee8ee463c3 [GDNative] cache API hashes 2018-01-13 21:21:05 +01:00
bruvzg
d0868a8f40
Fix String::itos/String::num_int64(INT64_MIN) output. 2018-01-13 22:06:08 +02:00
Rémi Verschelde
5988ae6cda
Merge pull request #15676 from eska014/html5-enginewrap 
Wrap Emscripten module into JS Engine singleton per SCons
 2018-01-13 20:16:36 +01:00
Leon Krause
bd1750c076 Wrap Emscripten module into JS Engine singleton per SCons 
Emscripten's meta DCE changes in 1.37.27(/28?) make it impossible to
keep using --pre-js for this
 2018-01-13 19:40:59 +01:00
Hugo Locurcio
bf32d36230
Disable colored output and progress bar when building outside of a TTY 
This makes the output more readable if it is written to a file,
and more compact in continuous integration environments, keeping
the log sizes low.

This commit also adds myself to .mailmap.
 2018-01-13 17:56:41 +01:00
Rémi Verschelde
892568abee
Merge pull request #15670 from poke1024/fix15588 
Fixes hangs with Tree in multi selection mode (issue 15588)
 2018-01-13 17:45:03 +01:00
Bernhard Liebl
363980519c Fixes hangs with Tree in multi selection mode (issue 15588) 2018-01-13 17:34:12 +01:00