aboutsummaryrefslogtreecommitdiff
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1174 from adolson/autoreload-edited-scriptsJuan Linietsky2015-02-091-1/+5
|\
| * fixesDana Olson2015-01-171-1/+2
| * add option to automatically reload changed scriptsDana Olson2015-01-101-1/+4
* | Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProjectJuan Linietsky2015-02-091-1/+1
|\ \
| * | Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."Nathan Warden2015-01-161-1/+1
* | | Merge pull request #1271 from NateWardawg/NestedSceneFixJuan Linietsky2015-02-092-1/+33
|\ \ \
| * | | Fixed a bug where if a scene hadn't been saved it would find a cyclical depen...Nathan Warden2015-01-201-5/+9
| * | | Fixed a bug where a user could add a cyclical dependency, causing a crash.Nathan Warden2015-01-192-1/+29
* | | | Merge pull request #1303 from erbridge/revert_menu_itemJuan Linietsky2015-02-092-0/+22
|\ \ \ \
| * | | | Show a confirmation for the revert action.Felix Laurie von Massenbach2015-01-271-1/+8
| * | | | Move the Revert Scene menu item to be less intrusive.Felix Laurie von Massenbach2015-01-261-2/+2
| * | | | Add a revert menu item.Felix Laurie von Massenbach2015-01-252-0/+15
* | | | | io_scene_dae: fixed invalid variable nameSegey Lapin2015-02-041-2/+2
|/ / / /
* | | | fixed world vertex issues in canvas item shaderJuan Linietsky2015-01-211-1/+1
* | | | Visual Shader Editing for 2DJuan Linietsky2015-01-203-9/+26
|/ / /
* | | Color Ramp and Curve Map added to visual shader editing.Juan Linietsky2015-01-195-3/+906
* | | -intentional breakage of shader graph to fix issues, existing graphs will be ...Juan Linietsky2015-01-181-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-112-5/+23
| | |/ | |/|
* | | Merge pull request #1204 from marynate/PR-new-default-themeJuan Linietsky2015-01-17101-3/+3
|\ \ \
| * | | More desaturated iconsRalf Hölzemer2015-01-154-0/+0
| * | | New iteration of the themeRalf Hölzemer2015-01-152-3/+3
| * | | New neutral default themeRalf Hölzemer2015-01-1597-3/+3
| | |/ | |/|
* | | 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
|\ \ \
| * | | Export Manager FixesAndreas Esau2015-01-151-15/+50
| |/ /
* / / Wrapped duplicated CellOp generation code in a function and added TileMap til...Carl Olsson2015-01-172-39/+46
|/ /
* | Merge pull request #1215 from Qwertie-/PR-GUIJuan Linietsky2015-01-141-1/+1
|\ \
| * | Fixed typo in messageLuke Picciau2015-01-141-1/+1
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-01-138-57/+49
|\ \ \
| * | | 2D shader progressreduz2015-01-117-55/+47
| * | | Fixes #1160BenH2015-01-111-2/+2
| | |/ | |/|
* / | fixesJuan Linietsky2015-01-132-1/+6
|/ /
* | Merge pull request #1156 from marynate/PR-fix-compile-tools-noJuan Linietsky2015-01-091-4/+2
|\ \
| * | Fix compile error when tools=nomarynate2015-01-091-4/+2
* | | mergable version of ndee's pull requestDana Olson2015-01-092-22/+488
|/ /
* | Merge branch 'fix_debug_process_exited_alert'Maximillian2015-01-081-2/+0
|\ \
| * | Fix process being debugged has exited pop up #1128Maximillian2015-01-081-2/+0
* | | Merge branch 'master' of https://github.com/okamstudio/godotMaximillian2015-01-082-17/+66
|\ \ \ | |/ / |/| |
| * | Fixes to GraphEdit:Juan Linietsky2015-01-082-9/+37
| * | -Fixed matrix and vec+scalar multiplication issues, fixes #1143Juan Linietsky2015-01-071-7/+28
| * | -changed type of C component of vec interp, fixes #1144Juan Linietsky2015-01-071-1/+1
* | | Merge remote-tracking branch 'upstream/master'Maximillian2015-01-0733-46/+91
|\| |
| * | -Visual Shader Editing Finished, PLEASE TEST!Juan Linietsky2015-01-0733-46/+91
* | | fix little mistake that made the project run each saveMaximillian2015-01-061-1/+0
* | | Prompt save dialog if running a unsaved scene. Solution for #966Maximillian2015-01-062-5/+26
* | | Fix invaild path error text in project manager when no path is enteredMaximillian2015-01-061-2/+2
|/ /