| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | MarianoGNU | 2015-10-16 | 43 | -5034/+8123 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-30 | 3 | -13/+78 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # scene/gui/spin_box.cpp # scene/gui/tree.cpp | |||||
| | | * | | | | | | | Add missing icons, also make MSVC2010 happy | Mariano Javier Suligoy | 2015-08-30 | 1 | -4/+11 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-30 | 13 | -16/+522 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp # tools/editor/property_editor.h | |||||
| | | * | | | | | | | | Compile shaders using default values. | Mariano Javier Suligoy | 2015-08-30 | 1 | -8/+2 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Edit default values. WARNING!!! | Mariano Javier Suligoy | 2015-08-29 | 4 | -323/+727 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not merge these changes, default values are not compiled into shaders yet! | |||||
| | | * | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-25 | 9 | -10/+199 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-24 | 38 | -233/+1986 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-09 | 17 | -60/+330 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Mariano Javier Suligoy | 2015-08-03 | 12 | -15/+566 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Delete selected nodes with the Delete key | Mariano Javier Suligoy | 2015-07-26 | 2 | -0/+42 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Little fix: don't create an empty undo/redo command when trying to add a ↵ | Mariano Javier Suligoy | 2015-07-25 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second Input GraphNode | |||||
| | | * | | | | | | | | | | | Duplicate GraphNode(s) [Control+D] | Mariano Javier Suligoy | 2015-07-25 | 2 | -3/+42 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Fix tab indent | Mariano Javier Suligoy | 2015-07-20 | 2 | -1808/+1808 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Select and move multiple nodes at once | Mariano Javier Suligoy | 2015-07-19 | 2 | -1789/+1806 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Use popup menu to add new nodes to the shader graph editor in the last ↵ | Mariano Javier Suligoy | 2015-07-16 | 2 | -16/+27 | |
| | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked location. | |||||
| * | | | | | | | | | | | | -fixes disability to remove instanced nodes when reopening scene. Fixes #2610 | Juan Linietsky | 2015-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-10-17 | 5 | -4/+25 | |
| |\| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge pull request #2053 from rodolforg/fix-import-button-label | Juan Linietsky | 2015-10-17 | 1 | -3/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Small fix for Import Game dialog labels | |||||
| | | * | | | | | | | | | | | Small fix for Import Game dialog labels | Rodolfo Ribeiro Gomes | 2015-06-08 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #2250 from PeaceSells50/AddedGridMapSettings | Juan Linietsky | 2015-10-17 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added GridMap settings which allows the user to enter a pick distance. | |||||
| | | * | | | | | | | | | | | | Added GridMap settings which allows the user to enter a pick distance. | Peace Sells | 2015-07-09 | 1 | -0/+1 | |
| | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #2357 from volzhs/prevent-to-change-tool-mode | Juan Linietsky | 2015-10-17 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent to change tool mode when control key is pressed | |||||
| | | * | | | | | | | | | | | | remove shift key check because shift + v in use with tool mode | volzhs | 2015-08-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | prevent to change tool mode when control or shift key is pressed | volzhs | 2015-08-11 | 1 | -0/+3 | |
| | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #2362 from AlexHolly/update-scene-tab-fix | Juan Linietsky | 2015-10-17 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [UI-FIX] - Update scene tabs on save | |||||
| | | * | | | | | | | | | | | | update scene tabs on save - fix | Alexander Holland | 2015-08-12 | 1 | -1/+1 | |
| | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge pull request #2380 from StraToN/tabs-buttons | Juan Linietsky | 2015-10-17 | 2 | -0/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tab close button + display policies + application on Scenes Tabs | |||||
| | | * | | | | | | | | | | | | Added close button to tab. Added 4 display policies for this close button ↵ | Julian Murgia - StraToN | 2015-08-18 | 2 | -0/+16 | |
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy. | |||||
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-10-17 | 16 | -88/+941 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #2479 from firefly2442/cppcheck-unusedvars | Juan Linietsky | 2015-10-17 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ran cppcheck, found unused variables | |||||
| | | * | | | | | | | | | | | | ran cppcheck, found unused variables | firefly2442 | 2015-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge pull request #2488 from slapin/remove-unimplemented-exporter-option | Juan Linietsky | 2015-10-17 | 1 | -5/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove of use_exclude_ctrl_bones option | |||||
| | | * | | | | | | | | | | | | | Remove of use_exclude_ctrl_bones option | Sergey Lapin | 2015-09-18 | 1 | -5/+0 | |
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use_exclude_ctrl_bones option is not implemented. This option is supposed to filter-out unneeded skeleton bones. This option was never implemented (in repository) and confuses users that feature exists. This commit removes this option as this option implementation is not happenning any time soon and claim it exists confuses users into thinking the feature is supported. Closes #2476 | |||||
| | * | | | | | | | | | | | | | Merge pull request #2549 from shackra/docdump-openproj | Juan Linietsky | 2015-10-17 | 4 | -0/+632 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation Converter from XML to Open Project wiki markup format | |||||
| | | * | | | | | | | | | | | | | Minor changes: Organizing imports | Jorge Araya Navarro | 2015-10-07 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Minor changes | Jorge Araya Navarro | 2015-10-07 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Internationalization implemented | Jorge Araya Navarro | 2015-10-07 | 4 | -52/+326 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify which language you want the templates translate to with the `--language` option and any choice language available. By default English is used. When class_list.xml is translated to different language than English this option will be useful to make the template language match. | |||||
| | | * | | | | | | | | | | | | | Refactoring some strings and ordering imports | Jorge Araya Navarro | 2015-10-06 | 1 | -70/+52 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | XML to Open Project Wiki implemented | Jorge Araya Navarro | 2015-09-27 | 1 | -35/+229 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Adding the new Python file | Jorge Araya Navarro | 2015-09-26 | 1 | -0/+184 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script works different compared to the other, for instance, it requires Python 3.x to run. It also have more sophisticate flags to run. And finally this file conforms to PEP8. This script is not finished yet, though. | |||||
| | * | | | | | | | | | | | | | | Merge pull request #2555 from jackmakesthings/class-reference-formatting | Juan Linietsky | 2015-10-17 | 1 | -6/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Readability improvements for the in-game class reference | |||||
| | | * | | | | | | | | | | | | | | Small readability fixes for the in-game class reference - fixes #2515 and ↵ | Jack Gold | 2015-09-29 | 1 | -6/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #2393 (text spacing and top/left padding for the text area, respectively). | |||||
| | * | | | | | | | | | | | | | | | Merge pull request #2569 from TheHX/issue_2567 | Juan Linietsky | 2015-10-17 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | Fix bug in EditorPlugin::add_custom_control | |||||
| | | * | | | | | | | | | | | | | | Fix bug in EditorPlugin::add_custom_control, fixes #2567 | Franklin Sobrinho | 2015-10-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | -fixes and more fixes to new scene system, seems stable now.. | reduz | 2015-10-16 | 3 | -1/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!! | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godot | reduz | 2015-10-10 | 17 | -4773/+5633 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Large improvements on scene packing and management | reduz | 2015-10-10 | 8 | -76/+255 | |
| | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes | |||||
| * | | | | | | | | | | | | | | | | misc cleanup | Juan Linietsky | 2015-10-17 | 4 | -4/+5 | |
| | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | newline fixes | reduz | 2015-10-08 | 4 | -4753/+4753 | |
| | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
 |
index : godot.git | |
| Godot Engine – Multi-platform 2D and 3D game engine https://godotengine.org | J08nY |
| aboutsummaryrefslogtreecommitdiff |