Commit graph

3962 commits

Author SHA1 Message Date
Rémi Verschelde
a2fee79459 Merge pull request #4843 from Paulb23/breakpoints_next_prev_and_remove_issue_1690
Added, goto next and previous breakpoint and remove all, issue 1690
2016-05-29 18:35:07 +02:00
Rémi Verschelde
e8d5ff5169 Merge pull request #4823 from Paulb23/fix_backspace_selection_redo_crash
Fix crash when redoing backspace to clear selection
2016-05-29 18:34:31 +02:00
Rémi Verschelde
d3b46b6bf2 Merge pull request #4822 from Paulb23/breakpoint_marker_issue_4750
Added breakpoint markers, issue 4750
2016-05-29 18:34:13 +02:00
Rémi Verschelde
5bbb67fcac Merge pull request #4814 from neikeq/pr-issue-4805
Debugger: show error message if description is not available
2016-05-29 18:32:35 +02:00
Rémi Verschelde
6a7530c718 Merge pull request #4812 from neikeq/pr-search-bar
ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar
2016-05-29 18:32:06 +02:00
Rémi Verschelde
7d262947af Merge pull request #4810 from marcelofg55/master
Added application/fat_bits property for EditorExportPlatformOSX::Edit…
2016-05-29 18:28:10 +02:00
Rémi Verschelde
3f8cd70c1a Merge pull request #4871 from Geequlim/translation-zh_cn
Add Simplified Chinese translation
2016-05-29 18:16:50 +02:00
Geequlim
0a046e6232 Simplified Chinese Translation:
Fix issuse in last commit
Add more translation
2016-05-30 00:08:33 +08:00
Geequlim
f9253fa47a Add Simplified Chinese translation 2016-05-30 00:08:33 +08:00
Rémi Verschelde
53279bf02d FreeType: Add mandatory license text
Part of #4859.
2016-05-29 17:30:57 +02:00
Juan Linietsky
65615c0353 fix freetype paths on osx and mingw 2016-05-29 12:26:15 -03:00
Juan Linietsky
3e8eb396d7 Finalized DynamicFont implementation
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Ignacio Etcheverry
51be9beec9 ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar 2016-05-29 14:26:19 +02:00
Rémi Verschelde
a5777994cb Merge pull request #4868 from Geequlim/more-tranlatable
Set more visible string to translatable
2016-05-29 11:55:11 +02:00
Geequlim
cb05e8450d Set more visible string to translatable 2016-05-29 16:10:23 +08:00
George Marques
cb3faf0b6f Merge pull request #4860 from Griefchief/msvc_build_fix
Fix MS Visual Studio build settings
2016-05-28 23:31:13 -03:00
Rémi Verschelde
f2bb7722ab Merge pull request #4864 from StraToN/classes-ref-writing
Documentation : BackBufferCopy, Light2D, LightOccluder2D
2016-05-29 01:56:10 +02:00
Julian Murgia - StraToN
9ac4b29322 Documented Light2D and LightOccluder2D 2016-05-29 01:41:22 +02:00
Julian Murgia - StraToN
defe7f18c2 Documented BackBufferCopy. Need validation for the different copy modes (constants) 2016-05-28 22:02:21 +02:00
Ignacio Etcheverry
aba972238e TextEdit: Improve search method to avoid overlapping results 2016-05-28 18:23:49 +02:00
Ignacio Etcheverry
65fa8f91ca TextEdit: Avoid capturing KEY_ESCAPE when there is no completion hint 2016-05-28 18:22:54 +02:00
Aleksandar Danilovic
ca876191e5 Fix MS Visual Studio build settings
NMake was not setup by the vsproj=yes compilation
parameter. After attempting other possible options,
this is the best fix for our current requirements.
Compiling via NMake is implementing an alternative
to SCons, so this fix escapes out of NMake
environment while also supporting different target
builds and IDE error list integration.

Also sets -j setting to 2 so that it's easy for
people to change it to a propper value and speed it
up a bit for those that do not.

Adds two missing .gitignore Visual Studio temp files
present in Visual Studio's .gitignore.
2016-05-28 17:15:12 +02:00
Rémi Verschelde
d9e8652893 Merge pull request #4857 from akien-mga/pr-fix-pm-base-dir
Editor: Fix base dir when going back to project manager
2016-05-28 15:04:20 +02:00
Rémi Verschelde
6fefcfd46a Editor: Fix base dir when going back to project manager
This caused the PM to load with the parameters of the previously loaded project.
Was a regression from ea751724a2. Closes #4045.
2016-05-28 14:59:00 +02:00
Rémi Verschelde
b2013603b4 i18n: Sync translations with template 2016-05-28 13:01:13 +02:00
Rémi Verschelde
71f18fdaae i18n: Add makefile to handle translation updates 2016-05-28 13:00:57 +02:00
Rémi Verschelde
d708afdc1c i18n: Fix typo and sync template 2016-05-28 12:46:17 +02:00
Mariano Javier Suligoy
b6fdac80cb Merge pull request #4852 from MarianoGnu/master
Remove focus from Sprite Region Editor dialog. Fixes #4751
2016-05-28 04:40:27 +02:00
MarianoGNU
e7b7dfefd3 Remove focus from Sprite Region Editor dialog. Fixes #4751 2016-05-27 22:53:26 -03:00
Juan Linietsky
bccdc11dde Added translation support to Godot
included is a French translation!
2016-05-27 19:58:28 -03:00
Juan Linietsky
8be2fabbe5 Changed import workflow
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
2016-05-27 14:19:11 -03:00
Paulb23
daf0ed646f Added, goto next and previous breakpoint and remove all, issue 1690 2016-05-27 15:29:04 +01:00
Rémi Verschelde
eb7227a20b Merge pull request #4839 from Geequlim/fix-memory-compiler-warnnings
Add spaces to macros in memory.h to make C++11 compilers happy
2016-05-27 11:22:59 +02:00
Geequlim
728ce570a5 Add spaces to macros in memory.h to make C++11 compilers happy 2016-05-27 16:48:27 +08:00
Rémi Verschelde
b0a97579ac README.md: Add codetriage badge 2016-05-27 01:12:06 +02:00
Paulb23
4a5997ec1c Fix crash when redoing backspace to clear selection 2016-05-26 14:45:11 +01:00
Paulb23
72fda444d1 Added breakpoint markers, issue 4750 2016-05-26 14:17:14 +01:00
Ignacio Etcheverry
ea9cde8842 Debugger: show error message if description is not available 2016-05-25 22:57:41 +02:00
marcelofg55
ba0fbe4f79 Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX 2016-05-25 15:17:28 -03:00
Rémi Verschelde
9daaa70920 Merge pull request #4808 from Paulb23/mark_and_breakpoint_colors
Added settings to change marked and breakpoint color
2016-05-25 18:15:32 +02:00
Paulb23
27dbbd68d5 Added settings to change marked and breakpoint color 2016-05-25 16:57:33 +01:00
Rémi Verschelde
a16eb3726c Merge pull request #4806 from Hinsbart/sregion_tooltip
Set tooltip for SpriteRegionEditor
2016-05-25 13:52:15 +02:00
Andreas Haas
abbdfb5739 Set tooltip for SpriteRegionEditor 2016-05-25 13:42:11 +02:00
Rémi Verschelde
c7ac70cc9e Merge pull request #4788 from volzhs/dir-error-windows
fix unexpected char: '\' error on windows for android module
2016-05-25 07:52:38 +02:00
Rémi Verschelde
12a6153ab4 Merge pull request #4800 from Hinsbart/tilemap_zoom
Add a slider for zooming TileMap preview icons.
2016-05-24 23:06:00 +02:00
Rémi Verschelde
a629e83b15 Merge pull request #4784 from neikeq/pr-missing-4296
Save line number color with text editor theme
2016-05-24 22:45:00 +02:00
Andreas Haas
11f728fc98 Add a slider for zooming TileMap preview icons.
Fixes #2413
2016-05-24 20:36:53 +02:00
Andreas Haas
677b77036a Allow ItemList icons to stretch to max size. 2016-05-24 20:36:46 +02:00
Rémi Verschelde
15e9f66a1a Merge pull request #4798 from Paulb23/caret_color_not_setting
Fixed caret colour not changing though properties
2016-05-24 17:09:46 +02:00
Paulb23
6dd538a7ae Fixed caret color not changing though properties 2016-05-24 15:21:34 +01:00