aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1352 from Hinsbart/masterJuan Linietsky2015-02-101-1/+1
|\
| * fix typo in script templateHinsbart2015-02-101-1/+1
|/
* Merge pull request #1176 from Spooner/add_sprintfJuan Linietsky2015-02-096-21/+1007
|\
| * Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)2015-02-1019-107/+501
| |\
| * \ Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)2015-02-01335-8704/+6310
| |\ \
| * | | Completed more complex formatting.Bil Bas (Spooner)2015-02-012-65/+423
| * | | Completed implementing standard formatting.Bil Bas (Spooner)2015-02-012-40/+135
| * | | Added basic sprintf functionality (e.g. "fish %d %s" % [12, Vector2(1, 2)])Bil Bas (Spooner)2015-01-104-2/+193
| * | | Ignored more generated files.Bil Bas (Spooner)2015-01-101-0/+2
* | | | ability to customize max render elementsJuan Linietsky2015-02-092-6/+29
| |_|/ |/| |
* | | Merge pull request #1300 from umxprime/fix/ios-init-crashJuan Linietsky2015-02-091-7/+12
|\ \ \
| * | | Fix init crash on iPad 1st gen device with iOS 5.1.1Maxime CHAPELET2015-01-231-7/+12
| | |/ | |/|
* | | Merge pull request #1299 from umxprime/fix/isim-sdk-pathJuan Linietsky2015-02-091-1/+1
|\ \ \
| * | | Fix iOS Simulator SDK path for isim platform.Maxime CHAPELET2015-01-221-1/+1
| |/ /
* | | Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_e...Juan Linietsky2015-02-091-18/+18
|\ \ \
| * | | fixes cubemap ressource editor bugyg2f2015-01-101-18/+18
* | | | 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 #1179 from marynate/PR-fix-compile-winJuan Linietsky2015-02-090-0/+0
|\ \ \ \
| * | | | Fix compile compile error on windows platformmarynate2015-01-111-1/+1
* | | | | 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 #1251 from adolson/fscache-stuffJuan Linietsky2015-02-093-37/+1
|\ \ \ \ \ \
| * | | | | | ignore and remove .fscache files. closes #1249Dana Olson2015-01-173-37/+1
* | | | | | | Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpressJuan Linietsky2015-02-091-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix whitespace on previous commitManuel Lagang2015-01-171-1/+1
| * | | | | | | Modifiers are unset on events for the modifier key itselfManuel Lagang2015-01-171-3/+4
* | | | | | | | 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 #1281 from sanikoyes/Pr-fix-rtt-filtersJuan Linietsky2015-02-091-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix filter options not works in render target texturesanikoyes2015-01-201-2/+10
| |/ / / / / / / /
* | | | | | | | | 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
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #1306 from sambler/freebsd_fixesJuan Linietsky2015-02-092-2/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix build on freebsdsambler2015-01-272-2/+25
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1307 from sambler/scons_changesJuan Linietsky2015-02-091-17/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adjust x11/detect.pysambler2015-01-271-17/+11
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1325 from hrib/masterJuan Linietsky2015-02-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed math in Camera::project_positionjaromirhribal2015-01-311-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1336 from slapin/exporter2Juan Linietsky2015-02-091-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | io_scene_dae: fixed invalid variable nameSegey Lapin2015-02-041-2/+2
|/ / / / / / / /
* | | | | | | | 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