Manuel Lagang
a4f40ec3be
Fix whitespace on previous commit
...
Choose tabs or spaces, not both!
2015-01-17 23:06:20 -08:00
Manuel Lagang
fa62125e05
Modifiers are unset on events for the modifier key itself
...
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-17 22:40:01 -08:00
Juan Linietsky
3e7d475b59
Merge pull request #1241 from the-mech/master
...
added nvidia optimus enablement Issue #1120
2015-01-16 23:02:13 -03:00
the_mech
726d379775
added nvidia optimus enablement
2015-01-17 02:48:35 +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
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
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
marynate
3a0f665c90
Total rows of text edit was calculated wrong, fixed issue #842
2015-01-13 17:16:56 +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
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
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
Juan Linietsky
d30f4e52f6
Merge branch 'master' of https://github.com/okamstudio/godot
2015-01-10 17:37:56 -03:00
Juan Linietsky
8997084831
2D Rewrite Step [1]
...
-=-=-=-=-=-=-=-=-=-
-Moved drawing code to a single function that takes linked list (should make it easier to optimize in the future).
-Implemented Z ordering of 2D nodes. Node2D and those that inherit have a visibility/Z property that affects drawing order (besides the tree order)
-Removed OpenGL ES 1.x support. Good riddance!
2015-01-10 17:35:26 -03:00
Juan Linietsky
f97582b5e9
Merge pull request #1166 from adolson/fix-texture-flag-bug
...
fix saving texture flags to *.png.flags file, closes #399
2015-01-10 07:47:00 -03:00
Dana Olson
88591af4ac
fix saving texture flags to *.png.flags file, closes #399
2015-01-10 02:37:00 -05:00
Juan Linietsky
0a6f409323
Merge pull request #1156 from marynate/PR-fix-compile-tools-no
...
Fix compile error when tools=no
2015-01-09 08:40:07 -03:00
Juan Linietsky
bfd0d1448e
Merge pull request #1159 from adolson/ndee-blender-exporter
...
Better Collada fixes & ndee's Blender Export Manager
2015-01-09 08:34:44 -03:00
Dana Olson
66a2adbf4b
mergable version of ndee's pull request
2015-01-09 01:36:38 -05:00
marynate
e2f5cf3ef0
Fix compile error when tools=no
2015-01-09 11:20:02 +08:00
Juan Linietsky
0c2222188e
Merge pull request #945 from adolson/color-contrasted-fix
...
avoid potential stack overflow by recursive function call
2015-01-08 21:59:39 -03:00
Juan Linietsky
a6c2400b24
Merge pull request #946 from adolson/uint64-fix
...
wrong typedef - closes #270
2015-01-08 21:59:25 -03:00
Juan Linietsky
fe63e6a0a8
Merge pull request #958 from adolson/bind-set_window_title
...
added GDScript binding for OS.set_window_title()
2015-01-08 21:58:43 -03:00
Juan Linietsky
3b5fcebeb7
Merge pull request #1114 from rraallvv/vanilla
...
Fix issue #1113
2015-01-08 21:58:09 -03:00
Juan Linietsky
2e33c4c02b
Merge pull request #1129 from xodene/master
...
Some polishes to editor UI
2015-01-08 21:57:30 -03:00
Juan Linietsky
8131891695
Merge pull request #1151 from rraallvv/master
...
OS X: Add keyboard layout detection and fix build
2015-01-08 21:56:28 -03:00
Maximillian
5b7b817c9b
Merge branch 'fix_debug_process_exited_alert'
2015-01-08 09:33:40 -07:00
Maximillian
41b3a1fea3
Merge branch 'master' of https://github.com/okamstudio/godot
2015-01-08 09:30:13 -07:00
Maximillian
f1b9994cbc
Fix process being debugged has exited pop up #1128
2015-01-08 09:14:56 -07:00
Rhody Lugo
08cfad00dd
Create the test string to detect kb layouts directly from the unicode chars
2015-01-08 10:31:10 -04:30
Rhody Lugo
d046bd88ad
OS X: Add keyboard layout detection and fix build
2015-01-08 02:56:27 -04:30
Juan Linietsky
78f4b93703
Fixes to GraphEdit:
...
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
2015-01-08 00:41:34 -03:00
Juan Linietsky
3f1dd9c57f
-Fixed matrix and vec+scalar multiplication issues, fixes #1143
2015-01-07 20:29:05 -03:00
Juan Linietsky
1659f82e7e
-changed type of C component of vec interp, fixes #1144
2015-01-07 19:48:38 -03:00
Maximillian
5c5519e2c8
Merge remote-tracking branch 'upstream/master'
2015-01-07 10:23:00 -07:00
Juan Linietsky
978769cdf1
Merge branch 'master' of https://github.com/okamstudio/godot
2015-01-07 01:46:28 -03:00
Juan Linietsky
7a0e4c822c
-Visual Shader Editing Finished, PLEASE TEST!
2015-01-07 01:45:46 -03:00
Maximillian
5d86f845d7
fix little mistake that made the project run each save
2015-01-06 20:35:52 -07:00
Maximillian
cf616e5845
Prompt save dialog if running a unsaved scene. Solution for #966
2015-01-06 15:28:25 -07:00
Maximillian
d8c14af546
Fix invaild path error text in project manager when no path is entered
2015-01-06 11:46:47 -07:00