maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3942 commits 10 branches 35 tags 1.1 GiB
Commit graph

3942 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Rémi Verschelde f7b5fdc923 Merge pull request #4794 from mcanders/RemovePrint 
Remove noisy print
 2016-05-24 08:32:39 +02:00
Carter Anderson 7df5249779 Remove noisy print 2016-05-23 22:56:32 -07:00
Rémi Verschelde 98e73429af Merge pull request #4792 from djrm/better_property_ranges 
Better property ranges
 2016-05-24 07:35:42 +02:00
Juan Linietsky e843e74d39 General docks clean up 
-Moved path box above in fs dock
-Remove up/down button and added reordering with DND of favorites
-Changed zoom icon to be centered vertically
-Made filter for files always visible
-Added some options to TextureFrame for better alignment/stretching
 2016-05-23 23:24:32 -03:00
Daniel J. Ramirez ba0baa3ca7 Modified damp ranges 2016-05-23 18:23:51 -05:00
Daniel J. Ramirez c9350d7897 Clamped some light2D ranges 2016-05-23 17:56:10 -05:00
volzhs 472ab44768 D&D: Fix wrong path in ScenesDock (#4789) 
Fixes #4786
 2016-05-23 23:14:47 +02:00
volzhs 5eb14d3af0 fix unexpected char: '\' error on windows 
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```
 2016-05-24 05:25:22 +09:00
Juan Linietsky d3495b128a -Improve resource previews 
-Also fixed draw_texture_rect() tile parameter
 2016-05-23 17:11:49 -03:00
Ignacio Etcheverry bb61ef9d9a Save line number color with text editor theme 2016-05-23 17:23:05 +02:00
Rémi Verschelde b777b32470 Merge pull request #4296 from Paulb23/code_editor_themes 
Added color themes to the text editor
 2016-05-23 17:08:06 +02:00
Paulb23 d7073a77e1 Added color themes to the text editor 2016-05-23 15:15:55 +01:00
Rémi Verschelde beeed210c9 Merge pull request #4779 from volzhs/issue-4723 
use node name as filename when save scene
 2016-05-23 15:56:23 +02:00
volzhs 9e1ee568a6 use node name as filename when save scene 
fix #4723
 2016-05-23 22:27:58 +09:00
Rémi Verschelde 8a6933afb1 Merge pull request #4772 from iap-mutant/PR-fix4748 
Fix #4748: proper call to base class function
 2016-05-23 13:29:38 +02:00
Rémi Verschelde 29d9eb02b9 Merge pull request #4765 from Ovnuniarchos/ColorPoly 
Polygon2D now exposes vertex colors.
 2016-05-23 13:28:28 +02:00
Hugo Locurcio e75701e0b5 Change the default comment color to #676767 (#4763) 
A neutral gray color, more readable than the old brown one.
 2016-05-23 13:27:15 +02:00
Ignacio Armenteros 7caabd9398 Fix #4748: proper call to base class function 2016-05-23 11:49:51 +02:00
anatoly techtonik e56f05c690 README.md docs are not wiki (#4770) 2016-05-23 11:29:46 +02:00
Rémi Verschelde c721c20f05 Merge pull request #4762 from Calinou/increase_editor_fps 
Change low processor usage mode to cap to 60 FPS rather than 40 FPS
 2016-05-23 07:55:05 +02:00