Commit graph

3231 commits

Author SHA1 Message Date
Rémi Verschelde
85d9f72b8a Merge pull request #3585 from Hinsbart/hscroll
support horizontal mouse wheel
2016-02-04 19:06:17 +01:00
Rémi Verschelde
6ea0863ed3 Merge pull request #3587 from akien-mga/pr-reserved-keyords
Fix missing comma
2016-02-04 18:57:25 +01:00
Rémi Verschelde
ade7329625 Fix missing comma 2016-02-04 18:56:41 +01:00
George Marques
0f41a18344 Merge pull request #3582 from akien-mga/pr-reserved-keyords
Add preload and PI to GDScript reserved keywords
2016-02-04 14:52:44 -02:00
hondres
df4faf8f33 support horizontal mouse wheel, use in text editor 2016-02-04 17:16:22 +01:00
Rémi Verschelde
99d9188da8 Add preload and PI to GDScript reserved keywords
I've noticed that gd_tokenizer also has keywords for `switch' and `do', but they seem not to be supported actually (only used in commented code for the shader language), so I don't add them.
2016-02-04 10:26:10 +01:00
Rémi Verschelde
8151110002 Reorder reserved words by categories
They were previously kind of sorted with a mix between alphabetical and logical ordering, which made it hard to spot duplicates or missing words.
2016-02-04 10:17:23 +01:00
blackwc
87be775b0d add feature to exclude files from export 2016-02-04 04:07:08 -05:00
Rémi Verschelde
cefca4429c Merge pull request #3575 from Hinsbart/_net_wm_name
x11: set _net_wm_name property
2016-02-04 07:19:52 +01:00
hondres
61c1b6f60e x11: set _net_wm_name property 2016-02-04 00:39:53 +01:00
Juan Linietsky
bdfac2806f -Fix mouse coordinates not being affected by canvas transform 2016-02-03 09:31:55 -03:00
Juan Linietsky
6d63dda72b Merge pull request #3534 from Biliogadafr/pickable2d
Physics2D: Allow to use 'intersect_point' with not 'Pickable' objects
2016-02-03 08:56:49 -03:00
Rémi Verschelde
c0aade4ba4 Merge pull request #3493 from Hinsbart/wm_class
x11: use different strings for WM_CLASS depending on context
2016-02-03 11:30:22 +01:00
Rémi Verschelde
7cb930dbed Merge pull request #3502 from trtstm/csv
Added delimiter to File.get_csv_line
2016-02-03 11:21:52 +01:00
Rémi Verschelde
fc65a57ff5 Merge pull request #3538 from Hinsbart/temp
remove pc_joystick_map.h
2016-02-03 11:18:43 +01:00
Rémi Verschelde
84b2aa5a62 Merge pull request #3558 from akien-mga/pr-regex-test
Fix return value of regexp string test
2016-02-03 07:49:23 +01:00
Juan Linietsky
259bd73cae -make stream player and time restore state properly if removed, fixes #1949 2016-02-02 23:27:10 -03:00
punto-
dcb823b293 Merge pull request #3560 from Hinsbart/axis_names
fix joystick axis names in project settings
2016-02-02 21:58:20 -03:00
Juan Linietsky
f026838cbc -only save scripts if changed, takes less time to run projects and does not confuse you with changed dates. 2016-02-02 21:10:52 -03:00
Juan Linietsky
ff2cb6360d Merge branch 'master' of https://github.com/godotengine/godot 2016-02-02 20:45:34 -03:00
Juan Linietsky
6349c50f5a -Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415 2016-02-02 20:44:42 -03:00
hondres
1395029d8a fix joystick axis names in project settings 2016-02-03 00:15:50 +01:00
punto-
261d2efa1d Merge pull request #3540 from adolson/more_js_maps
added more gamepad mappings
2016-02-02 19:33:08 -03:00
punto-
a24fc3369c Merge pull request #3559 from Hinsbart/device_fix
x11: fix non-gamepad devices being detected as joysticks
2016-02-02 19:32:03 -03:00
hondres
f7b1ab843c x11: fix non-gamepad devices being detected as joysticks 2016-02-02 23:23:20 +01:00
Juan Linietsky
9c4c6e4c4f -fix path clear in animation call param, closes #3448 2016-02-02 19:04:45 -03:00
Juan Linietsky
857edbea1c -make animationplayer thinner, also toolbuttons too. fixes #3526 2016-02-02 18:22:37 -03:00
Rémi Verschelde
746a2996c9 Fix return value of regexp string test
Closes #3556
2016-02-02 20:58:00 +01:00
Rémi Verschelde
d2f2eed963 Merge pull request #3555 from techtonik/patch-1
test_string.cpp - show numbers of passed and total tests correctly
2016-02-02 16:46:07 +01:00
anatoly techtonik
3d1b15e0d7 test_string.cpp - show numbers of passed and total tests correctly (fixes #3553) 2016-02-02 18:42:09 +03:00
Juan Linietsky
a9412b8744 -make autoloads keep order when toggling singleton, fixes #3482 2016-02-02 08:06:59 -03:00
Juan Linietsky
a479ce6e86 -Made Joystick menus friendlier, show button index, more up to date names and axis names. Closes #3501 2016-02-02 07:56:08 -03:00
Juan Linietsky
f6a8a0f513 -Correctly flip BG texture if viewport is flipped, fixes #3507 2016-02-02 07:40:38 -03:00
Juan Linietsky
ddf21735ba -remove the !inside_tree error, fixes grab focus error, closes #3521 2016-02-01 21:32:47 -03:00
Juan Linietsky
9386b76497 -Propertly detect mantissa floats in variantparser, fixes #3257 2016-02-01 19:17:05 -03:00
Juan Linietsky
b587614653 Make sure variant parser recognizes "nil" for compatibility with old engine.cfg style cofig. Closes #3531 2016-02-01 19:01:06 -03:00
Juan Linietsky
cecb37a7a3 Merge pull request #3532 from eska014/fix-globals-vectors
Encode vectors in Globals
2016-02-01 18:59:47 -03:00
Dana Olson
d1aacb8f33 added more gamepad mappings 2016-02-01 12:24:19 -05:00
hondres
f4fa74fe28 remove pc_joystick_map.h 2016-02-01 14:28:53 +01:00
Rémi Verschelde
519c866703 Merge pull request #3536 from Hinsbart/close
close file descriptor if ioctls failed
2016-02-01 13:45:46 +01:00
hondres
2809b31f8c close file descriptor if ioctls failed 2016-02-01 13:39:50 +01:00
Rémi Verschelde
d3bd1a731c Merge pull request #3533 from Biliogadafr/FixColorArrayTscn
Parse ColorArrays correctly (tscn), fixes #3530
2016-02-01 11:53:23 +01:00
Rémi Verschelde
ffbd79518b Merge pull request #3523 from vnen/fix-platformer-tile
Fix wall_deco tile position in Platformer demo
2016-02-01 11:17:52 +01:00
Rémi Verschelde
7439947e13 Merge pull request #3518 from Ovnuniarchos/3DSoundServerBadReg
Variables SpatialSoundServer and SS pointed to SpatialSound2DServer.
2016-02-01 11:07:34 +01:00
Juan Linietsky
11933811ee store animation names in alphabetical order, fixes #3423 2016-02-01 00:31:13 -03:00
Biliogadafr
e8c5b41dd8 Physics2D: Allow to use 'intersect_point' with objects which is not 'pickable' 2016-02-01 04:30:16 +03:00
Biliogadafr
31fe57778d Parse ColorArrays correctly (tscn)., fixes #3530 2016-02-01 02:56:58 +03:00
Ariel Manzur
0cd8c054a2 thread renaming 2016-01-31 20:23:24 -03:00
Ariel Manzur
b406aae790 total pointers 2016-01-31 20:23:24 -03:00
Ariel Manzur
5b68608b10 checking for file? 2016-01-31 20:23:23 -03:00