Juan Linietsky
|
f5af623cd4
|
Merge pull request #2700 from neikeq/demo_icons
Added project icon to some demos
|
2015-11-18 19:20:21 -03:00 |
|
Juan Linietsky
|
551925475b
|
Merge pull request #2626 from TheHX/editor_dialogs
Small fixes in some editor dialogs
|
2015-11-18 19:17:55 -03:00 |
|
Juan Linietsky
|
e82afd9c50
|
Merge pull request #2629 from firefly2442/float-to-bool
float to bool variable type, fixes: #2478
|
2015-11-18 19:17:29 -03:00 |
|
Juan Linietsky
|
536daca8f6
|
Merge pull request #2631 from firefly2442/duplicate-conditional-fix
duplicate conditional check
|
2015-11-18 19:17:01 -03:00 |
|
Juan Linietsky
|
e8435cc721
|
Merge pull request #2632 from firefly2442/duplicate-inherited-vars
remove child variable that is duplicated from parent class
|
2015-11-18 19:16:35 -03:00 |
|
Juan Linietsky
|
75922c57d6
|
Merge pull request #2635 from StraToN/tabs-buttons
Fixed bug : both tab buttons appearing hovered
|
2015-11-18 19:15:13 -03:00 |
|
Juan Linietsky
|
326781f4c9
|
Merge pull request #2636 from TheHX/fixed_material
Bind missing FixedMaterial constants, fixes #2628
|
2015-11-18 19:14:48 -03:00 |
|
Juan Linietsky
|
762a76630c
|
Merge pull request #2638 from MarianoGnu/master
add missing default value
|
2015-11-18 19:14:37 -03:00 |
|
Juan Linietsky
|
a8f18e1bae
|
Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
|
2015-11-18 19:14:25 -03:00 |
|
Juan Linietsky
|
cba634c608
|
Merge pull request #2640 from firefly2442/settings-xml-missing-proj
projects in the editor_settings.xml that are no longer found on disk will be removed
|
2015-11-18 19:14:12 -03:00 |
|
Juan Linietsky
|
474822b6db
|
Merge pull request #2642 from leezh/nrex-update
Updated nrex with new features
|
2015-11-18 19:13:57 -03:00 |
|
Juan Linietsky
|
6aa95e77f3
|
Merge pull request #2652 from firefly2442/fix-icons
Fix icons (default location and in demos)
|
2015-11-18 19:13:05 -03:00 |
|
Juan Linietsky
|
1ceefd4759
|
Merge pull request #2661 from romulox-x/lowMem2D
Added low_memory_2d_mode
|
2015-11-18 19:12:34 -03:00 |
|
Juan Linietsky
|
d38fd747ab
|
Merge pull request #2672 from Brickcaster/patch-1
Fix for world_to_map() with negative coords. Fixes issue #2665
|
2015-11-18 19:07:53 -03:00 |
|
Juan Linietsky
|
5db5255260
|
Merge pull request #2676 from neikeq/inspector_history_tooltip
Tooltip for the Inspector's history button
|
2015-11-18 19:04:16 -03:00 |
|
Juan Linietsky
|
3c1fdedc9d
|
Merge pull request #2679 from eska014/set-all-tileset-shapes
Add all collision shapes to a tile when converting scenes to TileSets
|
2015-11-18 19:03:59 -03:00 |
|
Juan Linietsky
|
34a558ee8d
|
Merge pull request #2691 from volzhs/android_payment
improve android payments
|
2015-11-18 19:02:40 -03:00 |
|
Juan Linietsky
|
f1156b7c48
|
Merge pull request #2693 from TheHX/memory_leak
Fix small memory leak
|
2015-11-18 19:02:05 -03:00 |
|
Juan Linietsky
|
c0170d3891
|
Merge pull request #2695 from eska014/add-default-angular-damp
Set World2D default angular damp per global `physics_2d/default_angular_damp`
|
2015-11-18 19:01:49 -03:00 |
|
Juan Linietsky
|
b0d3c27d31
|
Merge pull request #2725 from SaracenOne/line_edit_alignment
nice!
|
2015-11-18 19:01:04 -03:00 |
|
Juan Linietsky
|
7f5eb40c19
|
Merge pull request #2726 from SaracenOne/set_loop_restart_time_fix
Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis
|
2015-11-18 19:00:38 -03:00 |
|
Juan Linietsky
|
8bbde9e6cc
|
Merge pull request #2730 from TheHX/fix_exp_property
Fix Range exp_edit property
|
2015-11-18 19:00:19 -03:00 |
|
Juan Linietsky
|
ee944e0da2
|
Merge pull request #2734 from neikeq/popupmenu_imp
Small PopupMenu behaviour changes
|
2015-11-18 18:59:56 -03:00 |
|
Juan Linietsky
|
b4f88eb4b6
|
Merge pull request #2735 from TheHX/fix_tree_checkbox
Fix Tree checkbox check/uncheck behavior
|
2015-11-18 18:59:02 -03:00 |
|
Juan Linietsky
|
f738906519
|
Merge pull request #2737 from akien-mga/type-specific-error-output
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
|
2015-11-18 18:58:22 -03:00 |
|
Juan Linietsky
|
ef6fab88be
|
Merge pull request #2747 from MarianoGnu/line_edit
Add <Select All>(Ctrl+A) shortcut to LineEdit. Fixes #1094
|
2015-11-18 18:55:59 -03:00 |
|
Juan Linietsky
|
9827c3cd26
|
Merge pull request #2748 from vnen/fix-2744
Fix Opus driver build for VS2010 and VS2012
|
2015-11-18 18:55:19 -03:00 |
|
Juan Linietsky
|
5dcfdb3435
|
Merge pull request #2749 from TheHX/fix_string_content_test
Fix String content test
|
2015-11-18 18:55:01 -03:00 |
|
Juan Linietsky
|
e84fa04141
|
Merge pull request #2764 from guilhermefelipecgs/fix_camera2d_set_zoom
Fix for smoothing camera2D when you change zoom.
|
2015-11-18 18:44:50 -03:00 |
|
Juan Linietsky
|
9833fc21e6
|
Merge pull request #2767 from akien-mga/PR-node-rename-problem2
Fix node renaming bug when using the '.' character
|
2015-11-18 18:44:11 -03:00 |
|
Juan Linietsky
|
f2b43e3ec0
|
Merge pull request #2769 from TheHX/text_edit_improvements
Implement Ctrl + backspace/delete to delete words
|
2015-11-18 18:42:37 -03:00 |
|
Juan Linietsky
|
0f615c523c
|
Merge pull request #2770 from TheHX/fix_quat_operator
Implement Quat multiply operator, and bind xform method
|
2015-11-18 18:40:53 -03:00 |
|
Juan Linietsky
|
fecf79c000
|
Merge pull request #2775 from n31r0/master
Remove of use_exclude_ctrl_bones (was removed in io_scene_dae by Serg…
|
2015-11-18 18:40:19 -03:00 |
|
Juan Linietsky
|
4dc06dfdcd
|
Merge pull request #2776 from eska014/extend-object
GDScript: Allow extending directly from Object
|
2015-11-18 18:39:51 -03:00 |
|
Juan Linietsky
|
0bbe1e1657
|
Merge pull request #2779 from bojidar-bg/patch-5
Change popup_menu.cpp to deselect on .clear
|
2015-11-18 18:36:39 -03:00 |
|
Juan Linietsky
|
4fdb4452b8
|
Merge pull request #2784 from masoudbh3/resigning-android-template
Skip META-INF from Android Template
|
2015-11-18 18:35:08 -03:00 |
|
Juan Linietsky
|
5360e34c82
|
Merge pull request #2808 from Ovnuniarchos/ShapeLine2DXPolygonEditor
2D shapes editor update
|
2015-11-18 18:19:50 -03:00 |
|
Ovnuniarchos
|
0b05739a8b
|
*Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor.
|
2015-11-18 19:20:50 +01:00 |
|
Juan Linietsky
|
b08312b30c
|
-Fixed default theme a little
-Added option to group help pages, fixes #2805
|
2015-11-18 09:20:46 -03:00 |
|
Juan Linietsky
|
18e014a193
|
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
drivers/theora/video_stream_theora.cpp
|
2015-11-18 04:49:28 -03:00 |
|
Juan Linietsky
|
3974fbb852
|
-fixed tabs
|
2015-11-18 04:47:41 -03:00 |
|
Juan Linietsky
|
17bde66cd8
|
missing icons
|
2015-11-17 09:47:18 -03:00 |
|
Juan Linietsky
|
081a236c67
|
-Merged Script and Help tabs
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
|
2015-11-17 09:46:08 -03:00 |
|
Ariel Manzur
|
4811313056
|
tabs
|
2015-11-16 09:29:00 -03:00 |
|
Ariel Manzur
|
906c6374dc
|
drivers and theora
|
2015-11-16 08:44:03 -03:00 |
|
punto-
|
4893c932bb
|
Merge pull request #2795 from kurikaesu/master
iPhone platform fixes {resubmit}
|
2015-11-15 23:52:29 -03:00 |
|
Aren Villanueva
|
4f40a3dc65
|
Changed drviers/SCsub spaces to tabs.
|
2015-11-16 13:03:51 +11:00 |
|
Aren Villanueva
|
e68c2c6c2a
|
Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues.
|
2015-11-16 12:35:54 +11:00 |
|
Aren Villanueva
|
e420b69606
|
Properly fixes compilation in an msys environment.
|
2015-11-16 11:14:40 +11:00 |
|
Aren Villanueva
|
402c24ec8b
|
iOS compile fixes.
|
2015-11-16 11:10:07 +11:00 |
|