Commit graph

59979 commits

Author SHA1 Message Date
Nathan Warden
7d2f359a0c File path in save dialog automatically appended with correct extension if not manually added by the user. 2015-01-14 18:05:57 -05:00
Anton Yabchinskiy
d6998995b5 Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
	platform/x11/detect.py
2015-01-14 23:17:15 +03:00
Wim Vander Schelden
3d3b1937dd Cleaned up formating in gd_compiler.h 2015-01-14 16:37:24 +01:00
Juan Linietsky
04af74596d -fix shader param names broken issue on code completion
-fix z order issue in new 2D engine
2015-01-14 09:05:33 -03:00
Juan Linietsky
250188e1aa Merge pull request #1215 from Qwertie-/PR-GUI
Fixed typo in error message
2015-01-14 08:25:18 -03:00
hurikhan
07b8d9136a demo window set to resizeable (need a bugfix her) 2015-01-14 15:44:47 +08:00
sanikoyes
b882836184 Fix canvas shader not registered when disabled_3d=yes 2015-01-14 14:49:54 +08:00
hurikhan
cc49c86516 Merge branch 'x11-window-management' of https://github.com/hurikhan/godot into x11-window-management 2015-01-14 14:41:56 +08:00
MSC
1576dc5215 Update README.md 2015-01-14 13:49:10 +08:00
hurikhan
8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
	platform/x11/detect.py
2015-01-14 13:31:16 +08:00
hurikhan
2203ba5fe3 don't start demo in fullscreen mode 2015-01-14 13:27:03 +08:00
hurikhan
7222e195e5 minor cleanup 2015-01-14 13:19:27 +08:00
hurikhan
790d8ecbb9 get_screen() + set_screen() added 2015-01-14 12:02:59 +08:00
Luke Picciau
b734c838db Fixed typo in message 2015-01-14 12:02:55 +10:30
Juan Linietsky
9012cd408e -Add support for one-way collision in 2D (only works for kinematic body so far)
-Solve drawing order bug introduced in previous commit: solves #1214
2015-01-13 21:19:11 -03:00
Juan Linietsky
a327eee762 Merge pull request #1210 from sanikoyes/Pr-shader-refract
Pr-shader-add-missing-function-refract
2015-01-13 13:49:18 -03:00
sanikoyes
ffe53061cd Add missing shader function: refract 2015-01-14 00:28:18 +08:00
Juan Linietsky
823d7ae3b5 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 11:23:05 -03:00
Juan Linietsky
7c7ab30c4e fixes 2015-01-13 11:22:56 -03:00
Juan Linietsky
869f400179 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 10:50:33 -03:00
Juan Linietsky
2ef5a342e3 -begin work on unidirectional collision detection
-fixed performance issue in new 2D engine
-texscreen() working in shader 2D
2015-01-13 10:49:26 -03:00
Lukas Sägesser
aa242beb73 - how to use PolygonPathFinder from GD Script 2015-01-13 14:17:51 +01:00
hurikhan
f55c0e9285 Using Xinerama extension for getting screen info 2015-01-13 21:01:24 +08:00
Juan Linietsky
ab0c79aaf1 Merge pull request #1203 from marynate/PR-fix-textedit-totalrows
Total rows of text edit was calculated wrong, fixed issue #842
2015-01-13 08:13:21 -03:00
hurikhan
ce7c7a862e get_screen_position() added 2015-01-13 17:25:50 +08:00
marynate
3a0f665c90 Total rows of text edit was calculated wrong, fixed issue #842 2015-01-13 17:16:56 +08:00
hurikhan
1445b6806b Merge branch 'master' into x11-window-management 2015-01-13 15:56:27 +08:00
hurikhan
c0d3632667 introduced the scons experimental_wm_api switch:
================================================

Usage:
    scons p=x11 experimental_wm_api=yes
2015-01-13 15:44:39 +08:00
hurikhan
928e068f71 -try fixing LLVM color diagnostic on osx 2015-01-13 12:54:23 +08:00
Juan Linietsky
30d3658110 -fixed issue with shader not being reset on layers, closes #1199
-ability for shader to use parent shader and params, closes #1198
2015-01-12 20:44:02 -03:00
Juan Linietsky
544ce2a1db -Initial working(?) implementation of shaders for 2D. Lighting still not there though.
Check for reference:
https://github.com/okamstudio/godot/wiki/shader
2015-01-12 10:19:09 -03:00
hurikhan
067a0d0e64 osx support for llvm coloring added 2015-01-12 14:04:25 +08:00
hurikhan
f9a4e6890b SCons: colored compilation 2015-01-12 12:54:17 +08:00
hurikhan
6b6c526048 Merge branch 'master' into x11-window-management 2015-01-12 11:30:19 +08:00
reduz
f3dc51fc69 2D shader progress 2015-01-11 20:52:42 -03:00
Juan Linietsky
66afddb3e8 -Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later.
-fixed issue of opacity not working
2015-01-11 11:43:31 -03:00
hurikhan
c464cd4460 Merge branch 'master' into x11-window-management 2015-01-11 22:22:30 +08:00
hurikhan
16cf16da7e Update README.md 2015-01-11 22:02:18 +08:00
hurikhan
107d2a373a Demo misc/window_management added 2015-01-11 20:30:57 +08:00
Juan Linietsky
336d9ce5d7 Merge pull request #1184 from sketchyfun/master
Fixes #1160 - Path2D curve handle drag issue
2015-01-11 09:30:52 -03:00
BenH
fc4d6765f1 Fixes #1160
Fixed curve handles not taking current zoom level into consideration
when being dragged
2015-01-11 12:18:10 +00:00
hurikhan
f9d0de0d2a get_screen_size() added 2015-01-11 19:35:53 +08:00
hurikhan
3c8b047b11 get_screen_count() added 2015-01-11 18:52:42 +08:00
hurikhan
466e251abe get_window_size() + set_window_size() added 2015-01-11 17:36:56 +08:00
hurikhan
ac558c15ea get_window_position() + set_window_position() added 2015-01-11 15:47:27 +08:00
Dana Olson
9bbc3f0c94 fix naming of duplicated nodes, closes #1161, adds separator character preferences 2015-01-11 00:08:32 -05:00
marynate
bb6daaa02e Fix compile compile error on windows platform 2015-01-11 11:05:45 +08:00
hurikhan
291d7992ce Merge branch 'master' into x11-fullscreen 2015-01-11 08:06:31 +08:00
Bil Bas (Spooner)
7a41f8c604 Added basic sprintf functionality (e.g. "fish %d %s" % [12, Vector2(1, 2)]) 2015-01-10 20:44:20 +00:00
Bil Bas (Spooner)
d6d85a23c9 Ignored more generated files. 2015-01-10 20:42:28 +00:00