summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-09Merge pull request #1179 from marynate/PR-fix-compile-winJuan Linietsky
Fix compile compile error on windows platform
2015-02-09Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProjectJuan Linietsky
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
2015-02-09Merge pull request #1251 from adolson/fscache-stuffJuan Linietsky
ignore and remove .fscache files. closes #1249
2015-02-09Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpressJuan Linietsky
Modifiers are unset on events for the modifier key itself
2015-02-09Merge pull request #1271 from NateWardawg/NestedSceneFixJuan Linietsky
Pr - Fixed a bug where a user could add a cyclical dependency, causing a crash.
2015-02-09Merge pull request #1281 from sanikoyes/Pr-fix-rtt-filtersJuan Linietsky
Pr-fix-rtt-filters
2015-02-09Merge pull request #1303 from erbridge/revert_menu_itemJuan Linietsky
Add a revert menu item
2015-02-09Merge pull request #1306 from sambler/freebsd_fixesJuan Linietsky
fix build on freebsd
2015-02-09Merge pull request #1307 from sambler/scons_changesJuan Linietsky
Adjustment to x11/detect.py
2015-02-09Merge pull request #1325 from hrib/masterJuan Linietsky
fixed math in Camera::project_position
2015-02-09Merge pull request #1336 from slapin/exporter2Juan Linietsky
io_scene_dae: fixed invalid variable name
2015-02-04io_scene_dae: fixed invalid variable nameSegey Lapin
2015-01-31fixed math in Camera::project_positionjaromirhribal
2015-01-27Adjust x11/detect.pysambler
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined move appending -DTYPED_METHOD_BIND to keep clang options together move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
2015-01-27fix build on freebsdsambler
Add some needed includes Provide freebsd variation of get_executable_path Provide variation of execv so that either full path or appname to be found within $PATH can be used
2015-01-27Show a confirmation for the revert action.Felix Laurie von Massenbach
2015-01-26Move the Revert Scene menu item to be less intrusive.Felix Laurie von Massenbach
2015-01-25Add a revert menu item.Felix Laurie von Massenbach
2015-01-22begin work on lighting system for 2DJuan Linietsky
nothing functional yet, just experimenting with API
2015-01-21fixed world vertex issues in canvas item shaderJuan Linietsky
2015-01-20Fixed bug in 3D materialJuan Linietsky
textures that failed to load should now load again properly
2015-01-20Fixes to texscreen, fixes to white testcubeJuan Linietsky
2015-01-20Visual Shader Editing for 2DJuan Linietsky
Editing 2D shaders with visual editor seems to work now.
2015-01-20Fixed a bug where if a scene hadn't been saved it would find a cyclical ↵Nathan Warden
dependency.
2015-01-20Merge pull request #1280 from sanikoyes/Pr-InputEvent-FixJuan Linietsky
Pr-InputEvent-Fix
2015-01-20Fix filter options not works in render target texturesanikoyes
2015-01-20Add InputEvent::ACTION get/set support for variantsanikoyes
Add action_press/action_release method bind
2015-01-19Fixed a bug where a user could add a cyclical dependency, causing a crash.Nathan Warden
2015-01-19Color Ramp and Curve Map added to visual shader editing.Juan Linietsky
Added Color Ramp and Curve Map to shader nodes. Fixed an issue that crashed Godot Editor right when opened.
2015-01-18Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-01-18-intentional breakage of shader graph to fix issues, existing graphs will be ↵Juan Linietsky
broken, sorry :(
2015-01-17Fix whitespace on previous commitManuel Lagang
Choose tabs or spaces, not both!
2015-01-17Modifiers are unset on events for the modifier key itselfManuel Lagang
This patch removes modifiers when processing key events for the particular modifier key. For example, previously a Shift keypress would register as a Shift + Shift modifier event. This would cause issues when a modifier key as the action key in the input map, because unpresses of the modifier key don't match as matching inputs for that action. E.g. if Shift is used as an action, the stored action event is Shift + Shift modifier (as indicated in the editor as "Shift + Shift". The unpress event does not have the Shift modifier set, so the event of unpressing Shift + no modifier doesn't match the action which has the modifier set. This patch removes the shift modifier on just pressing the Shift key down, so the action event is registered as just Shift with no modifier (as indicated in the editor as "Shift"), which matches the unpress event.
2015-01-17ignore and remove .fscache files. closes #1249Dana Olson
2015-01-17Merge pull request #1250 from marynate/PR-fix-mingw-win-buildJuan Linietsky
Fix mingw windows build error
2015-01-18Fix mingw windows build errormarynate
2015-01-17Merge pull request #1138 from sanikoyes/Pr-tween-call-deferredJuan Linietsky
Pr-tween-call-deferred
2015-01-17Merge pull request #1172 from ↵Juan Linietsky
UsernameIsAReservedWord/fix_environment_ressource_interface_to_handle_cubemap_ressource fix_environment_ressource_cubemap_support, complete PR #1170
2015-01-17Merge pull request #1181 from adolson/duplicate-node-naming-prefsJuan Linietsky
fix naming of duplicated nodes, closes #1161
2015-01-17Merge pull request #1188 from hurikhan/scons_coloredJuan Linietsky
Scons colored
2015-01-17Merge pull request #1204 from marynate/PR-new-default-themeJuan Linietsky
new default theme
2015-01-17Merge pull request #1206 from ScyDev/feature/polygonpathfinder_demoJuan Linietsky
- how to use PolygonPathFinder from GD Script
2015-01-17Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3dJuan Linietsky
Pr-canvas-shader-disable-3d
2015-01-17Merge pull request #1221 from wvdschel/patch-1Juan Linietsky
Cleaned up formatting in gd_compiler.h
2015-01-17Merge pull request #1223 from NateWardawg/masterJuan Linietsky
1: File path in save dialog automatically appended with correct extension if not manually added by the user. 2: Removed .bin as default extension for Linux exports as it causes problems for common file managers.
2015-01-17Merge pull request #1225 from marynate/PR-script-editor-close-tabJuan Linietsky
Only show Close Tab confirmation when script has unsaved change
2015-01-17Merge pull request #1227 from marynate/PR-editor-line-colorJuan Linietsky
Add current_line_color editor setting for script and shader editor
2015-01-17Merge pull request #1230 from ndee85/export_manager_additionsJuan Linietsky
Export Manager Fixes
2015-01-17Merge pull request #1231 from quabug/commitJuan Linietsky
Fix bug in curve.cpp
2015-01-17Merge pull request #1244 from not-surt/masterJuan Linietsky
Wrapped CellOp generation code in a function and added TileMap tile picking