d0ea475405
Merge pull request #1359 from Hinsbart/fix_win_joy
...
fix get_joy_name() on windows
2015-02-12 16:04:03 +01:00
a13e180052
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-02-12 15:58:29 +01:00
df7d26ff5b
cleanup + MouseGrab
2015-02-12 15:58:00 +01:00
97e46194f4
fix get_joy_name() on windows
2015-02-12 04:17:29 +01:00
9de87ef7e3
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-11 21:41:52 +10:00
c613fb121b
Moved wrapper function to TileMapEditor.
2015-02-11 21:40:50 +10:00
b3a6cc097d
Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_support
...
add support for CADisplayLink
2015-02-11 12:33:16 +01:00
573ae5dd92
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
demos/2d/polygon_path_finder_demo/.fscache
2015-02-11 21:15:49 +10:00
9171f71ff5
Revert variant arg length to 5 and add 5 arg wrapper function for TileMap set_cell.
2015-02-11 21:11:14 +10:00
78a268c2eb
fixes to HTTPClient
...
-small unchunked files should work properly
-blocking mode should work properly
2015-02-11 07:57:51 -03:00
b4e1c1d717
Merge pull request #1327 from romulox-x/polygonPathFinderClosestPoint
...
changed PolygonPathFinder::get_closest_point to return the closest posit...
2015-02-11 07:12:15 -03:00
7f88df73be
Merge pull request #1346 from Nulifier/import-plugin
...
Added the ability to add and remove editor import plugins.
2015-02-11 07:07:59 -03:00
1d54c2dd1c
added missing set_shader_param functions
...
also added code completion hint for shader params
2015-02-11 06:51:20 -03:00
d22b256f08
customizable content margin in styleboxes
2015-02-10 23:53:04 -03:00
d67e866788
add support for CADisplayLink
2015-02-10 22:10:10 -04:30
8678658875
remove make.bat
2015-02-10 19:19:11 -03:00
878e805665
ignore make.bat
2015-02-10 19:18:00 -03:00
e74982e55e
fixes to skinned buffer
...
should avoid targets with large objects using morphs
also skinned buffer size is properly customizable on project settings.
2015-02-10 19:14:22 -03:00
84be16758e
Added the default arguments to the binding for ResourceImportMetadata::add_source to match the c++ version
2015-02-10 14:23:49 -07:00
dfb94de041
Merge pull request #1352 from Hinsbart/master
...
fix typo in script template
2015-02-10 15:48:32 -03:00
cbade4daf6
fix typo in script template
2015-02-10 19:39:52 +01:00
6e54fa3d47
Added get_gui_base to the EditorNode class to allow for import plugins to create centered Popups.
...
This is the function used by all the built-in import plugins. Without this, the only alternative is to add it to the EditorNode itself which messes up auto-centering and sizing.
2015-02-10 11:17:48 -07:00
13dc6f53ca
Added the ability to add and remove editor import plugins.
2015-02-09 23:36:16 -07:00
66d32b75b3
Merge pull request #1176 from Spooner/add_sprintf
...
Add sprintf
2015-02-09 22:21:43 -03:00
a34d27438c
ability to customize max render elements
...
should close #1339
2015-02-09 22:18:44 -03:00
58d7678947
Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
...
Conflicts:
.gitignore
2015-02-10 00:42:28 +00:00
f53b27dca3
Merge pull request #1300 from umxprime/fix/ios-init-crash
...
Fix init crash on iPad 1st gen device with iOS 5.1.1
2015-02-09 21:38:43 -03:00
b1ec72a799
Merge pull request #1299 from umxprime/fix/isim-sdk-path
...
Fix iOS Simulator SDK path for isim platform.
2015-02-09 21:38:38 -03:00
3b4fd0f24d
Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_editor
...
fixes cubemap ressource editor bug, fixes issue #908
2015-02-09 21:37:01 -03:00
80d0117b83
Merge pull request #1174 from adolson/autoreload-edited-scripts
...
add option to automatically reload changed scripts
2015-02-09 21:35:52 -03:00
85edf05343
Merge pull request #1179 from marynate/PR-fix-compile-win
...
Fix compile compile error on windows platform
2015-02-09 21:32:42 -03:00
a1ff40100e
Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProject
...
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
2015-02-09 21:32:20 -03:00
b3ab07ecd8
Merge pull request #1251 from adolson/fscache-stuff
...
ignore and remove .fscache files. closes #1249
2015-02-09 21:32:07 -03:00
3b3829e002
Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpress
...
Modifiers are unset on events for the modifier key itself
2015-02-09 21:31:39 -03:00
63a4faac3a
Merge pull request #1271 from NateWardawg/NestedSceneFix
...
Pr - Fixed a bug where a user could add a cyclical dependency, causing a crash.
2015-02-09 21:24:58 -03:00
e7918ebbf2
Merge pull request #1281 from sanikoyes/Pr-fix-rtt-filters
...
Pr-fix-rtt-filters
2015-02-09 21:24:09 -03:00
d45a227e25
Merge pull request #1303 from erbridge/revert_menu_item
...
Add a revert menu item
2015-02-09 21:21:48 -03:00
31d0c65298
Merge pull request #1306 from sambler/freebsd_fixes
...
fix build on freebsd
2015-02-09 21:20:22 -03:00
a8c492fb07
Merge pull request #1307 from sambler/scons_changes
...
Adjustment to x11/detect.py
2015-02-09 21:18:25 -03:00
cf96855e3f
Merge pull request #1325 from hrib/master
...
fixed math in Camera::project_position
2015-02-09 21:16:15 -03:00
f24fca70ab
Merge pull request #1336 from slapin/exporter2
...
io_scene_dae: fixed invalid variable name
2015-02-09 21:09:17 -03:00
2c8cc632d2
io_scene_dae: fixed invalid variable name
2015-02-04 04:40:09 +03:00
afa13bf868
Forgot to update tile transform buttons when picking tiles.
2015-02-03 19:51:21 +10:00
c21227a636
added preview picture
2015-02-02 23:29:19 +01:00
2db55ef6fc
added a demo for 2D fog of war
2015-02-02 23:08:57 +01:00
52700563bc
Finish GUI for tile transform.
2015-02-02 22:28:10 +10:00
ee44664b2a
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-02 21:34:47 +10:00
c5bf43f6eb
Working TileMap tile transpose transform.
2015-02-02 21:27:48 +10:00
2c1a3dfed6
Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
2015-02-01 20:29:11 +00:00
af7c8bdf23
Completed more complex formatting.
2015-02-01 20:18:38 +00:00
punto-
hurikhan
Hinsbart
Carl Olsson
Juan Linietsky
Rhody Lugo
Jeffrey Steward
Juan Linietsky
Bil Bas (Spooner)
Segey Lapin
fry-