aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adjust x11/detect.pysambler2015-01-271-17/+11
* begin work on lighting system for 2DJuan Linietsky2015-01-226-1/+180
* fixed world vertex issues in canvas item shaderJuan Linietsky2015-01-213-9/+9
* Fixed bug in 3D materialJuan Linietsky2015-01-201-3/+6
* Fixes to texscreen, fixes to white testcubeJuan Linietsky2015-01-202-6/+17
* Visual Shader Editing for 2DJuan Linietsky2015-01-2012-29/+137
* Merge pull request #1280 from sanikoyes/Pr-InputEvent-FixJuan Linietsky2015-01-202-0/+26
|\
| * Add InputEvent::ACTION get/set support for variantsanikoyes2015-01-202-0/+26
|/
* Color Ramp and Curve Map added to visual shader editing.Juan Linietsky2015-01-199-10/+1240
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-01-181-0/+4
|\
| * Merge pull request #1250 from marynate/PR-fix-mingw-win-buildJuan Linietsky2015-01-171-0/+4
| |\
| | * Fix mingw windows build errormarynate2015-01-181-0/+4
| |/
* / -intentional breakage of shader graph to fix issues, existing graphs will be ...Juan Linietsky2015-01-185-4/+25
|/
* Merge pull request #1138 from sanikoyes/Pr-tween-call-deferredJuan Linietsky2015-01-172-11/+114
|\
| * Add call deferred support for Tweensanikoyes2015-01-072-11/+114
* | Merge pull request #1172 from UsernameIsAReservedWord/fix_environment_ressour...Juan Linietsky2015-01-171-1/+1
|\ \
| * | fix_environment_ressource_cubemap_supportyg2f2015-01-101-1/+1
* | | Merge pull request #1181 from adolson/duplicate-node-naming-prefsJuan Linietsky2015-01-172-5/+23
|\ \ \
| * | | fix naming of duplicated nodes, closes #1161, adds separator character prefer...Dana Olson2015-01-113-6/+24
* | | | Merge pull request #1188 from hurikhan/scons_coloredJuan Linietsky2015-01-175-0/+49
|\ \ \ \
| * | | | -try fixing LLVM color diagnostic on osxhurikhan2015-01-131-1/+1
| * | | | osx support for llvm coloring addedhurikhan2015-01-121-0/+3
| * | | | SCons: colored compilationhurikhan2015-01-124-0/+46
* | | | | Merge pull request #1204 from marynate/PR-new-default-themeJuan Linietsky2015-01-17175-282/+433
|\ \ \ \ \
| * | | | | Restore checkbutton margin to origin value, fixed issue in code search dialogmarynate2015-01-151-2/+2
| * | | | | Minor code formattingmarynate2015-01-151-6/+5
| * | | | | Tweak Button margins & small fix for ToolButtonRalf Hölzemer2015-01-151-2/+2
| * | | | | fix background alpha in dropdown arrowsRalf Hölzemer2015-01-153-2/+2
| * | | | | Fixed the progressbar to only require 16px in heightRalf Hölzemer2015-01-151-2/+2
| * | | | | More desaturated iconsRalf Hölzemer2015-01-154-0/+0
| * | | | | Missing files and Tab changesRalf Hölzemer2015-01-154-6/+6
| * | | | | More Theme fixesRalf Hölzemer2015-01-1527-215/+366
| * | | | | Fix visual glitch in ProgressbarRalf Hölzemer2015-01-152-1/+1
| * | | | | New iteration of the themeRalf Hölzemer2015-01-1556-115/+116
| * | | | | New neutral default themeRalf Hölzemer2015-01-15164-72/+72
* | | | | | Merge pull request #1206 from ScyDev/feature/polygonpathfinder_demoJuan Linietsky2015-01-176-0/+90
|\ \ \ \ \ \
| * | | | | | - how to use PolygonPathFinder from GD ScriptLukas Sägesser2015-01-136-0/+90
* | | | | | | Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3dJuan Linietsky2015-01-171-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix canvas shader not registered when disabled_3d=yessanikoyes2015-01-141-3/+4
* | | | | | | | Merge pull request #1221 from wvdschel/patch-1Juan Linietsky2015-01-171-63/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleaned up formating in gd_compiler.hWim Vander Schelden2015-01-141-63/+47
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1223 from NateWardawg/masterJuan Linietsky2015-01-172-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | When overwriting a file with an auto added extension the file name is now set...Nathan Warden2015-01-161-1/+1
| * | | | | | | | Set the default Linux extension to nothing.Nathan Warden2015-01-151-1/+1
| * | | | | | | | File path in save dialog automatically appended with correct extension if not...Nathan Warden2015-01-141-1/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #1225 from marynate/PR-script-editor-close-tabJuan Linietsky2015-01-171-4/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Only show Close Tab confirmation when script has unsaved change;Update Close ...marynate2015-01-151-4/+7
| |/ / / / / / /
* | | | | | | | Merge pull request #1227 from marynate/PR-editor-line-colorJuan Linietsky2015-01-173-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add current_line_color ediotr setting for script and shader editormarynate2015-01-153-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #1230 from ndee85/export_manager_additionsJuan Linietsky2015-01-171-15/+50
|\ \ \ \ \ \ \ \