Commit graph

1015 commits

Author SHA1 Message Date
J08nY
621b8d1324
Object: get_signal_connection_list fixed
now returns only the connections for the signal argument, as specified
fixes #5329
2016-06-21 13:07:50 +02:00
Juan Linietsky
fa0d1cd27c fix CanvasItem.get_global_transform() and CanvasItem.get_local_transform(), closes #4075 2016-06-20 21:19:12 -03:00
Juan Linietsky
9d4cdc6d8a fix bug decompressing bc texture, closes #4404 2016-06-20 19:43:06 -03:00
Juan Linietsky
6872139300 Add quotes to .tscn keys, solves #4366 2016-06-20 18:41:59 -03:00
Juan Linietsky
e9d2c9ad51 added missing status, closes #4361 2016-06-20 17:54:42 -03:00
Rémi Verschelde
3668768463 Merge pull request #5196 from vnen/similarity-code-completion
Improve code completion search
2016-06-20 13:37:24 +02:00
Juan Linietsky
5e816fd8c8 Property reporty base type when a function fails, fixes #4581 probably also closes other issues 2016-06-20 01:15:02 -03:00
George Marques
1b8d0a16b7
Add similarity comparison to String
Uses the Sorensen-Dice coefficient to calculate similarity. This also adds
String.bigrams() as a convenience function needed by the comparison.
2016-06-19 11:39:01 -03:00
Rémi Verschelde
e76f744c36 Merge pull request #5283 from djrm/remove_prints
Removed lots of prints
2016-06-19 13:10:23 +02:00
Rémi Verschelde
df202127e3 Merge pull request #5281 from J08nY/useless-preprocessor
Fix #5263: Useless preprocessor condition
2016-06-19 13:09:25 +02:00
Juan Linietsky
7c20c386c5 -Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc.
-Better interpolation of discrete tracks, fixes #4417
2016-06-19 01:43:02 -03:00
Daniel J. Ramirez
422fac5066 Removed lots of prints 2016-06-18 18:01:06 -05:00
J08nY
449571b6cd
Remove USE_QUAD_VECTORS unused check 2016-06-19 00:41:52 +02:00
J08nY
a95a1f47a4
Remove CHARTYPE_16BITS unused checks
fix #5263
2016-06-19 00:12:31 +02:00
Juan Linietsky
1c541a2bee corrently parse utf8 from zip_io open, closes #1708
this probably failed when exporting or opening android apk files too, should fix that too.
2016-06-18 17:29:41 -03:00
Rémi Verschelde
c3bf11d4d4 Drop fully commented-out files
Part of #5272
2016-06-18 20:23:49 +02:00
Rémi Verschelde
80727b6896 Drop empty .cpp files for header-only classes
Part of #5272
2016-06-18 20:00:08 +02:00
Rémi Verschelde
b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Juan Linietsky
d8be671313 -Changed how Dir works so it's more user friendly, closes #4705 2016-06-18 12:11:48 -03:00
Juan Linietsky
e3905a084e -made get_space_left() return values more homogenous, also for script, converted to mb, closes #4617 2016-06-18 11:32:45 -03:00
Juan Linietsky
61655d6dc2 Fixed make_dir and make_dir_recursive erros, closes #1680 closes #1872 2016-06-18 11:13:03 -03:00
Rémi Verschelde
a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
Juan Linietsky
ebbd705b63 Merge pull request #5250 from bojidar-bg/add-sha256
Add sha256 to String and File/FileAccess.
2016-06-17 10:57:15 -03:00
Bojidar Marinov
7073bb0bb2
Add sha256 to String and File/FileAccess.
Probably does #4166
2016-06-17 10:55:16 +03:00
Juan Linietsky
f0d9245ecf -added missing .inc files
-Made it possible to change the editor theme
-Added two options to theme editor plugin to create empty template themes and editor themes
-Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
2016-06-17 01:13:23 -03:00
J08nY
6bbc53ee18
Fixed PacketPeer.get_var() return type in docs 2016-06-16 14:15:44 +02:00
J08nY
cffdc52482 Classref: Added docs for StreamPeer* (#5216) 2016-06-15 13:32:12 +02:00
Rémi Verschelde
78b745bb0a Merge pull request #5192 from J08nY/issue-5190
Dictionary: rename param in .has() .has_all() .erase()
2016-06-15 11:13:59 +02:00
Rémi Verschelde
ee105744e0 Merge pull request #5210 from J08nY/issue-5189
String documentation: .ord_at() returns int not String
2016-06-15 11:08:10 +02:00
Wilhem Barbier
f665200df7 Add joystick vibration support on Linux (#5043) 2016-06-15 07:25:35 +02:00
J08nY
58a891265a
String documentation: .ord_at() returns int not String
fixes #5189
2016-06-14 14:52:32 +02:00
Juan Linietsky
5f674bdca1 Merge pull request #5179 from RandomShaper/better-android-export
Enhanced Android export
2016-06-13 15:06:37 -03:00
J08nY
7a19e3c6ae
Dictionary: rename param in .has() .has_all() .erase()
fixes #5190, param should be named key, not value
2016-06-13 19:08:04 +02:00
Juan Linietsky
20b4567829 Merge pull request #5177 from vnen/string-subsequence
Add subsequence search to tools
2016-06-13 13:25:56 -03:00
Juan Linietsky
45443a1651 Changed reload logic to auto-hard-reload scripts on save. It's simpler to use and also fixes #4756 2016-06-13 10:58:32 -03:00
Juan Linietsky
910151a361 -Avoid negative zero from being saved to config files o resource files, fixes #4758 2016-06-13 10:16:43 -03:00
Juan Linietsky
7f02627290 -Add visible IO errors when closing a file fails due to it being locked (most likely on windows), closes #4760 2016-06-13 10:10:50 -03:00
Pedro J. Estébanez
e1948d520a Zip-align exported APK 2016-06-13 00:19:45 +02:00
George Marques
a6c37d2b5d
Add 'is_subsequence_of' function to String 2016-06-12 14:52:54 -03:00
Juan Linietsky
4bb93c976c Made error when signal calls a method with the wrong number of parameters more detailed, closes #4893 2016-06-12 12:32:45 -03:00
Juan Linietsky
9ddc13a5cc -All variables from script are visible through get_property_list(), not just those with export()
-Added PROPERTY_USAGE_SCRIPT_VARIABLE to identify what comes from script
-closes #5146
2016-06-11 18:34:49 -03:00
George Marques
46b6bb9dc4
Add 'rfind' function to Array 2016-06-10 17:46:57 -03:00
George Marques
269d570420
Add 'from' argument to Array.find() 2016-06-10 15:43:07 -03:00
Juan Linietsky
f8f30662d9 -Ability to reload (and soft reload) tool scripts. Please test! 2016-06-08 20:00:52 -03:00
Juan Linietsky
4b893ffeeb Merge pull request #4861 from brakhane/negative-indexing
Add support for Python-like negative indexing
2016-06-07 10:17:00 -03:00
J08nY
8a4eca8aa8
Exposed Image.INTERPOLATE_* 2016-06-07 11:46:07 +02:00
Rémi Verschelde
0729c852b4 Fix indentation issues in last commits
Ping @reduz.
2016-06-07 07:39:40 +02:00
Juan Linietsky
c86f1f1737 Merge pull request #4693 from kjohnson0451/dvector_invert
Adds invert() method DVector
2016-06-06 20:54:39 -03:00
Juan Linietsky
82b759d938 Merge pull request #4895 from TheoXD/_fix_interactive_loader_cache
fixed interactive_loader() not returning a cached scene
2016-06-06 20:35:54 -03:00
Juan Linietsky
736b65e566 Merge pull request #4977 from SaracenOne/scripting_expose
Expose extra methods and constants to scripts
2016-06-06 20:27:40 -03:00
Juan Linietsky
be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension
Enhanced Patch9Frame
2016-06-06 20:15:33 -03:00
Juan Linietsky
7499fa4507 Merge pull request #5048 from J08nY/dictionary
Added Dictionary.values()
2016-06-06 20:09:04 -03:00
Juan Linietsky
c42651c39e Merge branch 'master' of https://github.com/godotengine/godot 2016-06-06 19:56:34 -03:00
Juan Linietsky
85f4f39279 Added function get_signals_connected_to_this_this()
should help properly implement #5058
2016-06-06 19:55:50 -03:00
Roberto
04fc62c4e3 Add missing license information (MiniZip) 2016-06-06 12:32:02 +02:00
Juan Linietsky
2420e46b44 vsync support
-works on windows
-may not work on X11, if so please fix
-OSX does not seem to support disabling vsync
2016-06-05 19:14:33 -03:00
Dennis Brakhane
1e068d34f4 Add support for Python-like negative indexing
Negative indexing is a useful feature in Python, especially when combined
with array slicing. Array slicing will hopefully be implemented later, but
negative indexing is useful in its own right.

A negative index is indexing from the end of an array,
"array[-1] == array[array.size()-1]", using a negative index
larger/smaller than the length of the array is still an error.

While primarily useful for arrays and strings, support is also added to
"array like" structures like Vector3 and Color. This is done just
to be consistent; vector3[2] is much clearer than vector3[-1], but disallowing
it while allowing it for an array with 3 elements seems confusing.
2016-06-05 20:00:54 +02:00
Dennis Brakhane
842057e56f Move repetitive code to macros
In preparation for the following "allow negative indexing" commit,
replace the repetitive array "set index" and "get index" code with
macros.

no functional changes were made, the resulting machine code is unchanged.
2016-06-05 20:00:54 +02:00
Andreas Haas
a9779efe82 fix ui_* input events in Editor
`input/` is the category for these in globals ^^
fixes #5050
2016-06-05 19:06:57 +02:00
J08nY
dcce477f5e
Added Dictionary.values() 2016-06-05 14:50:06 +02:00
Juan Linietsky
64fd75d91a Make Input Actions config not affect the editor 2016-06-05 01:19:42 -03:00
Juan Linietsky
007efb6a20 -customizable shortcuts in editor
-editor settings now save to .tres instead of .xml
-buttons can now hold a shortcut
2016-06-04 21:31:47 -03:00
Rémi Verschelde
279b7921e8 Merge pull request #5036 from J08nY/inputmap-actions
Added InputMap.get_actions()
2016-06-04 21:37:57 +02:00
Rémi Verschelde
2884faf55b Merge pull request #4999 from volzhs/fix-project-path
change invalid characters when get user data dir on Windows & Unix
2016-06-04 21:37:47 +02:00
Geequlim
fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08:00
Juan Linietsky
3ae61f2292 Created a NodeDock with signals and groups 2016-06-04 13:19:08 -03:00
J08nY
1a80b2a04a
Added InputMap.get_actions()
get_actions() lists all actions in the InputMap.
2016-06-04 17:56:30 +02:00
J08nY
5f5ca8cd9b Added Array.find_last() and Array.count() 2016-06-03 23:36:02 +02:00
J08nY
b4fb4a131d Fix typo in http_client.h 2016-06-03 21:48:20 +02:00
Geequlim
2bbedd35dd Expose ResourceImportMetadata::set_source_md5 for script 2016-06-03 18:45:44 +08:00
volzhs
9073dc9963 change invalid characters when get user data dir on Windows & Unix
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.
2016-06-03 03:39:37 +09:00
Juan Linietsky
9e745b920f Ability to reload scripts on running game 2016-06-01 20:31:42 -03:00
Ignacio Etcheverry
cceb842a48 Removed invalid DEFVAL for HTTPClient::request_raw 2016-06-01 18:47:04 +02:00
Saracen
4bcc60008d Expose Vector2 abs method to scripts 2016-06-01 15:47:53 +01:00
Saracen
445909c1e1 Exposed remaining PROPERTY_USAGE constants to script 2016-06-01 15:47:49 +01:00
Saracen
7ebc422945 Expose string 'erase' method to script 2016-06-01 15:47:46 +01:00
Andreas Haas
da3247a500 Make Color.{rgba}8 return int instead float
According to the class doc, these should be int.
Also fixed a little bug: the setter for 'r8' changed the green value
2016-05-31 20:50:19 +02:00
Juan Linietsky
9b1f8230ec -Some fixes to OSX retina scaling for window functions
-Implemented HiDPI detection and support for Godot Editor!
2016-05-30 00:28:29 -03:00
TheoXD
47bd1e8688 fixed interactive_loader() not returning a cached scene 2016-05-30 02:47:33 +02:00
Juan Linietsky
4f100f92d8 DPI Detection support
Windows only for now.
Many builds may break (older visual studio, mingw32)
2016-05-29 13:40:21 -03:00
Rémi Verschelde
96bdab6edf Merge pull request #4845 from vnen/pr-magnetometer
Add magnetometer sensor support for Android
2016-05-29 18:37:33 +02:00
Juan Linietsky
3e8eb396d7 Finalized DynamicFont implementation
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Juan Linietsky
bccdc11dde Added translation support to Godot
included is a French translation!
2016-05-27 19:58:28 -03:00
fluffrabbit
4877b714b3
Add magnetometer sensor support for Android 2016-05-27 14:36:55 -03:00
Juan Linietsky
8be2fabbe5 Changed import workflow
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
2016-05-27 14:19:11 -03:00
Geequlim
728ce570a5 Add spaces to macros in memory.h to make C++11 compilers happy 2016-05-27 16:48:27 +08:00
Juan Linietsky
b2a4908e9c Real-Time Remote Inspector support 2016-05-22 19:29:06 -03:00
Juan Linietsky
eacb8f04c4 Merge remote-tracking branch 'origin/master' 2016-05-21 22:34:55 -03:00
Juan Linietsky
a75f896338 First version of Profiler
It is now possible to profile GDScript as well as some parts of Godot
internals.
2016-05-21 21:18:16 -03:00
Hubert Jarosz
33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
Juan Linietsky
c195c0df6b -Added configuration warning system for nodes
-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
2016-05-17 18:28:44 -03:00
punto-
433de90564 Removing round from int interpolation
This might break some animations that use int tracks in continuous mode, but it should provide a more uniform interpolation for things like sprite frames.
2016-05-17 13:27:49 -03:00
kjohnson0451
eb10c21a00 Adds the invert() method to DVector.
This effectively allows invert() to be used on the following types:
ByteArray, IntArray, RealArray, StringArray, Vector2Array, Vector3Array, ColorArray
2016-05-16 13:06:41 -04:00
Juan Linietsky
bed3efb17e New reworked AnimatedSprite!
-New SpriteFrames editor, with support for drag&drop, multiple animation
sets, animation speed and loop.
-New AnimatedSprite, with support for all the new features!
AnimatedSprite3D has not been updated yet.
-Added support for drag&drop to other editors, such as resourcepreload,
sample library,  etc.
2016-05-14 23:48:45 -03:00
Rémi Verschelde
22d1385caf classref: Directory and ConfigFile 2016-05-12 08:41:43 +02:00
Mattias Cibien
49c473bb36 Added possibility to strip left and right to strip_edges (#4594) 2016-05-11 09:22:59 +02:00
Rémi Verschelde
21a71e8b7c Merge pull request #4553 from AlexHolly/fix-percent-decode-utf8
fix percent decode utf8 error
2016-05-07 20:19:32 +02:00
Rémi Verschelde
c556a97b27 Variant: readd String.ends_with and Dict.has_all
Erroneously removed in cfd3efd097.
2016-05-06 10:45:09 +02:00
Ariel Manzur
cfd3efd097 export fix_alpha_edges 2016-05-05 18:41:06 -03:00
Alexander Holland
f86cffd8e6 fix percent decode utf8 error 2016-05-05 13:34:15 +02:00
Rémi Verschelde
c71afda499 Merge pull request #4549 from AlexHolly/httpclient-rawbody-support
HTTPClient request with raw_array body
2016-05-05 09:30:33 +02:00
Rémi Verschelde
99e31e1005 Merge pull request #4547 from neikeq/pr-wrong-debug-methods
Fix wrong return and argument types in documentation
2016-05-05 09:27:14 +02:00
Alexander Holland
ab1da5dc1b httpclient request withh raw_array body 2016-05-04 19:49:01 +02:00
Juan Linietsky
89d87294db ability to shrink all images x2 on load
this is for extreme cases when running on devices with very low video
memory, so you can still retain compatibility.
2016-05-04 12:37:07 -03:00
Ignacio Etcheverry
2060e6616c Add missing Vector2Array case to Variant::operator String()
- Correcly display Vector2Array default arguments in the documentation
2016-05-04 15:16:24 +02:00
Juan Linietsky
567cb691ec Modified editor strings to be translatable in the future 2016-05-03 22:25:37 -03:00
Juan Linietsky
5bb7cef836 Support for dynamic fonts (TTF)
Added support for DynamicFont, which can load a TTF of any size to use
as a font. No import required.
2016-05-01 23:13:06 -03:00
Rémi Verschelde
6883325f92 math: Fix rounding error for 0 in Math::round (#4495)
Thus revert the previous workaround in commit b123bc4a2a.
Fixes #3221.
2016-05-01 11:37:46 +02:00
Franco Eusébio Garcia
a735573327 Add math/script expression evaluation in editor (#3620)
Rebase of #453
2016-05-01 10:33:32 +02:00
Alexander Holland
6ad226ac38 fix - HTTPClient connection keep-alive duplicate Headers #4208 2016-04-27 21:07:49 +02:00
Rémi Verschelde
a1ebf555b7 Merge pull request #4409 from Hinsbart/encode_axis_value
Encode axis_value in Variant for InputEvent::JOYSTICK_MOTION.
2016-04-24 14:32:43 +02:00
Hinsbart
9201b5a27c Encode axis_value in Variant for InputEvent::JOYSTICK_MOTION.
Fixes a bug that caused InputMap actions which have been set to joystick axes
not to work correctly on exported builds as the axis_value property wouldn't be serialized into engine.cfb.
See recent discussion in #49 (Post 121+)
2016-04-23 15:26:07 +02:00
Hinsbart
3b12f9ea82 add sign comparison for joystick axis events in InputMap::_find_event
fixes #4400
2016-04-22 16:36:45 +02:00
Rémi Verschelde
fd07ef07fa Merge pull request #4345 from mownier/add/getter/http-client-connection
Added getter method for the connection property in HTTPClient.
2016-04-18 13:50:09 +02:00
Mounir Ybanez
0ca7e19242 Added getter method for the connection property in HTTPClient. (#4336)
- Exposed a getter method for the private property named `connection` in HTTPClient class.
2016-04-18 17:16:15 +08:00
Alexander Holland
a379ed56ea string ends_with 2016-04-17 23:49:21 +02:00
Bojidar Marinov
7a18bb8ace Fix File.get_csv_line not including quoted newlines in the output
Close #1232
2016-04-16 15:12:29 +03:00
Rémi Verschelde
89fcd529f3 Merge pull request #4223 from AlexHolly/dictionary-has-all
dictionary has_all
2016-04-11 20:59:35 +02:00
punto-
e8a0b2462b Use non-templated nearest_power_of_2
Works around #4262 and likely #4190.

(cherry picked from commit 3a390e9b44)
2016-04-11 08:49:44 +02:00
Rémi Verschelde
473de561f8 Remove duplicate 2016-04-07 21:20:22 +02:00
Alexander Holland
a8ebd43ab7 dictionary has_all 2016-04-04 18:37:43 +02:00
Rémi Verschelde
0a5472e697 Remove trailing spaces 2016-04-02 20:26:12 +02:00
Rémi Verschelde
81b449908e Add support for patch versions (2.0.x)
(cherry picked from commit 706d576f7b)
2016-03-22 18:41:09 +01:00
Kyle Luce
674c6f2f2d Add function to convert Date time from a dictionary to Epoch
- Also changed get_time_from_unix_time to get_date_time_from_unix_time to be
  consistent.

Ticket:
https://github.com/godotengine/godot/issues/4038
2016-03-16 23:13:39 -07:00
Kyle Luce
feef563f3f Fixes the month consistency issue in enums and get_date etc
- Also updated the docs to reflect this.
- Added some vim temp files to gitignore
- Changed NaCL to be consistent with the other OS_Unix::get_date implementation
   (added 1 to month to map to 1-12)

Ticket:
https://github.com/godotengine/godot/issues/4025
2016-03-13 15:27:39 -07:00
Rémi Verschelde
801221d01b Remove undefined binds
Bug introduced by 6eb4812
2016-03-12 18:53:13 +01:00
Saracen
6eb4812317 Borderless window support for the Win32 build. Default window position is now also centred. 2016-03-12 16:38:12 +00:00
Juan Linietsky
8b1dcbfe4d -Made editor support SSL certs by default (embedded them)
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 10:46:38 -03:00
Rémi Verschelde
042f8bf88c Merge pull request #3934 from Razzlegames/epocConvert
Added epoc to dictionary converter (for human readable display when only given an epoc time)
2016-03-10 15:00:58 +01:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Rémi Verschelde
1dad6eca81 Merge pull request #3991 from JoshuaGrams/issue-3711
Issue 3711
2016-03-08 23:54:46 +01:00
Rémi Verschelde
32bb7a04a2 Merge pull request #3833 from AlexHolly/feature-file-md5
expose md5 for file(s) to gdscript
2016-03-08 19:32:33 +01:00
Josh Grams
f7fad32188 Variant::blend: add Quat, fix Vector3. 2016-03-08 06:38:19 -05:00
hondres
9544042adb fix InputMap::action_erase_event()
fixes #3976
2016-03-07 19:00:17 +01:00
Kyle Luce
866e47ec54 Added epoc to dictionary converter
Useful for when user is storing time as epoc and wants to do operations on this
time and then display in human readable form

https://www.facebook.com/groups/godotengine/permalink/737469773056286/?comment_id=738011009668829&reply_comment_id=738192799650650&notif_t=group_comment_reply
2016-03-05 12:15:01 -07:00
Juan Linietsky
5a9b18b665 -Work on addon editor plugin (disabled by default)
-New HTTPRequest node, to make HTTP requests simpler.
2016-03-04 11:10:48 -03:00
Rémi Verschelde
002ff3cc9a Revert "Merge pull request #3814 from est31/iterators_for_for"
This reverts commit adf5056889, reversing
changes made to ee2bc87c0e.
2016-03-01 18:09:48 +01:00
Josh Grams
391ce81c5e AnimationTreePlayer: blend value tracks (closes #2299)
Variant:
- zero() sets a Variant to the appropriate type of zero value
- blend() blends part of one Variant on top of another.
2016-03-01 07:37:36 -05:00
est31
0b24a13fa0 Fix bug with nearest_power_of_2_templated
We have to shift log(num of bits) many times not num of bytes many.
2016-02-29 06:51:19 +01:00
sheepandshepherd
bc87ce6236 Add RangeIterator class for loops 2016-02-28 22:47:41 +01:00
Juan Linietsky
6fc1c3a4d1 Completed the support for plugins! It is not possible to add plugins.
Not all APIs are provided yet, please request whathever you are missing.
Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings.
Have fun!
2016-02-27 23:12:27 -03:00
Alexander Holland
d093f558ab expose md5 for file(s) to gdscript 2016-02-25 19:25:29 +01:00
Rémi Verschelde
32e1a56cd3 Merge pull request #3771 from est31/fix_memalloc
Fix allocation bug
2016-02-23 22:12:25 +01:00
eska
104e008b56 Fix missing dependency resolver in Windows 2016-02-21 22:51:19 +01:00
Ariel Manzur
cc7cca55b0 adds original http headers to response_headers 2016-02-19 17:13:29 -03:00
Ariel Manzur
5e36ae3bb6 adds original http header to response_headers 2016-02-19 17:13:29 -03:00
Ariel Manzur
3ac0267daa better array alignment 2016-02-19 07:01:57 -03:00
Ariel Manzur
0846ab6a5f fixes array allocation bug and sets DEFAULT_ALIGNMENT to 1. probably needs testing 2016-02-19 05:40:24 -03:00
est31
fb1e52f4d8 Fix allocation bug if compiled with modern clang or gcc
* Add overflow checked intrinsic abstractions that check on overflow.
* Use them for memory allocation code.
* Use size_t type for memory allocation code to support full platform dependent width.

Fixes #3756.
2016-02-19 07:58:42 +01:00
Aren Villanueva
7b25641813 Reject any native video player calls on iOS that point to files within .pck archives.
Fix the paths for both res:// and user:// specified video files.
2016-02-19 16:05:49 +11:00
Nuno Donato
b51c720c80 fix color when hue is set to 1 2016-02-18 10:34:45 +00:00
Rémi Verschelde
130f8fa193 Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT
The former name was incorrect in English, though for us latin lovers it's an understandable mistake.
Second part of and closes #3626.
2016-02-17 23:01:27 +01:00
Rémi Verschelde
188474df52 Merge pull request #3743 from StraToN/fix_ustring_camelcase2underscore
Fixed String::camelcase_to_underscore() so it works in all cases.
2016-02-17 21:27:37 +01:00
sheepandshepherd
c88c60d08e Correct octree's AABB intersect test, fixes #3576 and #3253 2016-02-17 20:06:40 +01:00
Julian Murgia - StraToN
7b47153072 Fixed String::camelcase_to_underscore() so it works in all cases. Fixes PR #1650 2016-02-17 19:26:22 +01:00
hondres
6de2b9d864 doc: use correct identifier for InputEventJoystick{Motion, Button} 2016-02-10 23:37:25 +01:00
hondres
df4faf8f33 support horizontal mouse wheel, use in text editor 2016-02-04 17:16:22 +01: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
Juan Linietsky
f6a8a0f513 -Correctly flip BG texture if viewport is flipped, fixes #3507 2016-02-02 07:40:38 -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
hondres
f4fa74fe28 remove pc_joystick_map.h 2016-02-01 14:28:53 +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
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
eska
b653762491 Encode vectors in Globals 2016-02-01 00:20:55 +01:00
Juan Linietsky
817fd1ab71 -Added method flags to global constants for script
-Added a new flag METHOD_FLAG_FROM_SCRIPT to get_method_list() flag property. Closes #3489
2016-01-31 15:40:51 -03:00
eska
0c85009f1c Remove debug prints 2016-01-29 18:04:06 +01:00
tmt
2447c3171f File: Added delimiter to get_csv_line 2016-01-28 23:20:18 +01:00
hondres
11e4c128ac x11: use different strings for WM_CLASS depending on context 2016-01-27 21:53:37 +01:00
Rémi Verschelde
6ceb1c3a9f Merge pull request #3440 from TheHX/issue-2946
Fixed small inconsistencies with the text format
2016-01-25 10:58:50 +01:00
Franklin Sobrinho
41ae83e415 Fixed small inconsistencies with the text format 2016-01-24 18:38:37 -03:00
Juan Linietsky
72d1f2ef30 Merge pull request #3437 from vnen/fix-3149
Change default video mode for X11
2016-01-24 17:44:26 -03:00
reduz
341f8e6d2b -remved p_peer is null error messages, fixes #1150 2016-01-24 16:59:39 -03:00
George Marques
f4a39692b9 Change default window size for desktop
Fix #3149
2016-01-24 17:52:33 -02:00
Juan Linietsky
c247f5ad61 Removed get() function from many variant typed arrays, fixes #2135 2016-01-24 01:00:42 -03:00
Juan Linietsky
a74138a0dc -Some changes to how scenes and scripts are overriden in scene instance and inheritance
-Fixes #3127 and also properly fixes #2958
2016-01-23 21:42:15 -03:00
Juan Linietsky
c9580965ea -Remote deploy now uses FS over USB on Android, super fast! 2016-01-20 00:29:34 -03:00
volzhs
fb2bf78591 Add ability to set "keep screen on" for android 2016-01-16 20:57:34 +09:00
Juan Linietsky
4248c84e20 -Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201 2016-01-14 11:06:20 -03:00
Tolga Cakir
f2beb66c65 Fix typo 2016-01-13 00:06:38 +01:00
punto-
7393e40452 Merge pull request #3272 from Hinsbart/joy-binding
Add some joystick functions to input. Enables manipulation of mapping…
2016-01-12 03:59:19 -03:00
Liangdi
bed76b3856 Fix xml opt with XML_ENABLE macro 2016-01-12 00:40:32 +08:00
Ariel Manzur
3db379376f made headers case insensitive 2016-01-11 07:49:05 -03:00
Rémi Verschelde
e2fb8b7042 Merge pull request #3297 from AlexHolly/comment-some-print_lines
comment some print_lines
2016-01-11 11:32:09 +01:00
Juan Linietsky
725b61bb6c properly handle typed array constructors in VariantParser, closes #3054 2016-01-10 23:22:48 -03:00
Juan Linietsky
a120c66f98 -Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision.
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
2016-01-10 18:24:55 -03:00
Juan Linietsky
52e53d4513 -Added a new mode, WRITE_READ to File, to recover compatibility with old projects but also achieve desired functionality. Closes #3272 2016-01-10 15:15:04 -03:00
Juan Linietsky
4fdab4f555 added a new function to escape properly json, fixes #3282 2016-01-10 15:01:06 -03:00
Juan Linietsky
cc34e0dee9 Make sure variant parser actually writes floats when float property is requested, closes #3301 2016-01-10 11:51:05 -03:00
Juan Linietsky
6c8cf30697 -fix stray file left open when parsing configuration, closes #3299 2016-01-10 10:00:58 -03:00
Juan Linietsky
f5a3c1ccde make sure file is closed if something fails 2016-01-10 09:59:14 -03:00
Alexander Holland
151e9600aa comment some print_lines 2016-01-09 23:53:34 +01:00
Juan Linietsky
292e8bf0ab fix issues related to StringArray parsing 2016-01-08 21:09:13 -03:00
Juan Linietsky
176afb2feb -Use simpler methods for parsing simple tags, fixes #3274 2016-01-08 19:03:17 -03:00
hondres
c632c13c66 Add some joystick functions to input. Enables manipulation of mappings at runtime 2016-01-08 00:40:41 +01:00
Juan Linietsky
b6388e6001 added ':' support to VariantParser, given it' s used by export.cfg 2016-01-07 09:16:11 -03:00
Juan Linietsky
4e367a4b7b -fix bugs related to parsing config files with new variantparser, closes #3248 closes #3207 2016-01-07 09:07:18 -03:00
mrezai
5bf25e46be Fix config file parser bug that cause showing project name as "Unnamed Project" 2016-01-06 12:10:38 +03:30
Juan Linietsky
3d0bd1a3f3 -make signals throw an error when target method is not found, fixes #2036
-removed 4 arguments limit for emit_signal() from script
-remvoed 4 arguments limit for call_deferred() from script
2016-01-04 09:35:21 -03:00
Juan Linietsky
0e71d49ef4 -Fix crash at exit due to unnecesary check in command queue, fixes #2034
-Fix memory corruption due to using wrong singleton in multithreaded physics, fixes #2760
2016-01-04 00:00:33 -03:00
Juan Linietsky
7a931b4d3a Fixed the decimals function, it can't be perfect but it should be good enough. Closes #1955 2016-01-03 19:18:47 -03:00
Juan Linietsky
e8fbf39f88 -Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
2016-01-03 17:14:28 -03:00
Juan Linietsky
1597082c85 -Ability to roll-back script-exported properties to their default value on the script, closes #2128 2016-01-02 20:17:31 -03:00
Juan Linietsky
32a6120a5c fixed string operator[], which was broken. Closes #2202 2016-01-02 14:58:27 -03:00
Juan Linietsky
757b8c4206 -Restore mouse on X11 when debugger break happens, closes #2232 2016-01-02 12:58:59 -03:00
Juan Linietsky
432e2e7769 proper joy axis support as actions, can be configured and inquired, fixes #2317 2016-01-02 09:37:16 -03:00
hondres
83baa05915 bind trigger constants 2016-01-02 04:23:39 +01:00
hondres
117ae93cf1 Analog values for gamepad triggers, using axes 6 & 7 2016-01-02 03:34:32 +01:00
Ignacio Etcheverry
3de30bf01d Added default value param to ConfigFile.get_value() 2016-01-01 21:12:54 +01:00
Juan Linietsky
199a29b353 Merge pull request #3184 from vnen/update-copyright-2016
Update copyright to 2016 in headers
2016-01-01 11:03:29 -03:00
George Marques
5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky
810f049edf introspection of signals and signal connections from GDScript was not working, fixes #2325 2016-01-01 10:28:15 -03:00
Juan Linietsky
37f2222dd7 -Added Color8(r8,g8,b8,a8) function as well as .r8,.g8,.b8,.a8 members to Color, to deal with colors in the 0-255 range. Closes #2345 2015-12-31 18:26:49 -03:00
Juan Linietsky
6b1849d29b make json sub-dictionaries shared, fixes #2381 2015-12-31 17:56:51 -03:00
Juan Linietsky
bc2b1696e6 suport old-style engine.cfg colors in VariantParser, fixes #3176 2015-12-31 14:30:50 -03:00
Juan Linietsky
586e482a98 -Fix parsing of comments in VariantParser, fixes #3175 2015-12-31 10:25:21 -03:00
Juan Linietsky
b60a3e7202 -Changed var2str and str2var in GDScript to use VariantWriter and VariantParser
-It is now finally possible to parse back a variant from text!
2015-12-31 00:54:00 -03:00
Juan Linietsky
335c52ba03 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-31 00:33:07 -03:00
Juan Linietsky
fd836cad27 -Ensure .tscn and .tres always save in a deterministic way, fixes #2495
-Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed
-Created a VariantWriter helper to unify all variant to text writing
-Moved SceneFormatText writing to VariantWriter
-Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 00:31:00 -03:00
reduz
555ad5f8b7 removed wron return types, fixes #2483
removed console, which was obsolete and unused sine long long ago
2015-12-29 18:46:21 -03:00
reduz
101fe4b845 remove an extra line 2015-12-29 14:58:16 -03:00
reduz
77b5b4f4df removed some prints 2015-12-29 12:56:58 -03:00
reduz
496cb49771 Fix proper ordering of project settings properties, also fixes inability to change order of autoloads 2015-12-28 18:04:22 -03:00
reduz
e0d21d2158 Ability to set autoloads as singleton global variables 2015-12-28 15:59:20 -03:00
Rémi Verschelde
d4993b74fc Add missing argument names in GDScript bindings
All classes were reviewed apart from VisualServer for which no argument name is documented at all.
While doing this review, I found quite a few bugs that were fixed either in earlier commits or this one (mostly documentation bugs though, i.e. some arguments were listed at the wrong place).
2015-12-28 02:13:05 +01:00
punto-
33e5c3181d Merge pull request #3101 from Hinsbart/remapping-new
Better gamepad support
2015-12-20 11:08:04 -03:00
Ariel Manzur
b989d4f887 thread can't rename itself on initialization :( 2015-12-18 09:48:39 -03:00
Ariel Manzur
f25812794d thread renaming by core_bind 2015-12-18 03:06:51 -03:00
hondres
af633c7941 Better gamepad support 2015-12-18 06:12:53 +01:00
Ariel Manzur
10298b9534 thread set name 2015-12-17 06:24:27 -03:00
Juan Linietsky
a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Ignacio Etcheverry
577bbcc6b3 Forbid renaming input presets 2015-12-14 22:36:53 +01:00
Juan Linietsky
1312df7fdc implement point cloud function using convex hull for ConvexPolygonShape2D, fixes #2848 2015-12-14 09:06:53 -03:00
Juan Linietsky
f2183a5e09 replaced :var by :Variant in documentation, fixes #2897 2015-12-14 08:28:01 -03:00
Juan Linietsky
7f96f0603e -scenes are properly reloaded when a dependency changes, fixes #2896
(it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-13 20:39:01 -03:00
Juan Linietsky
7c39ebd05c -hash dictionaries properly instead of using pointer, fixes #2880 2015-12-13 15:20:58 -03:00
Juan Linietsky
39f345a9ae -deprecated pcz, replaced by just zip. Closes #2879 2015-12-13 14:15:55 -03:00
Juan Linietsky
95a469ad28 added binary API to StreamPeer, fixes #2863 2015-12-13 12:53:29 -03:00
Juan Linietsky
9f75dd086e no more time error, fixes #2892 2015-12-12 19:21:43 -03:00
Juan Linietsky
6316f8941c variant parser was not parsing rect2 properly, fixes #2948 2015-12-12 17:10:43 -03:00
Juan Linietsky
cc7880fba5 -added windowed mode with -w, fixes #3020
-changed default windowed resolution to 1280x720
2015-12-12 12:06:53 -03:00
Juan Linietsky
9a7ff65751 make popup emit index when id is not defined 2015-12-12 09:07:43 -03:00
Juan Linietsky
b191e740d2 add pop_back/pop_front/push_back/push_front to array, to make it according to doc, fixes #3040 2015-12-12 08:27:30 -03:00
Rémi Verschelde
6221570f53 Merge pull request #3039 from TheHX/pr-in-operator
Fix "in" operator, make it use evaluate() instead of operator==
2015-12-11 15:15:01 +01:00
Franklin Sobrinho
6a34ab201a Fix "in" operator, make it use evaluate() instead of operator== 2015-12-11 10:29:55 -03:00
Franklin Sobrinho
e4dce93520 Fix error message when using is_connected with a script signal 2015-12-11 07:53:40 -03:00
Juan Linietsky
aadced2f72 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-09 09:10:00 -03:00
Juan Linietsky
6bc6b8fcf2 -ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003 2015-12-09 09:08:41 -03:00
romulox_x
2cc8340594 updated aes256 implementation to newer version from upstream. Also uses faster lookup table implemetation. 2015-12-08 16:13:06 -08:00
Juan Linietsky
176916524d Merge pull request #2841 from akien-mga/pr-ustring-snprintf
Cleanup calls to _snprintf in ustring
2015-12-08 17:17:49 -03:00
Juan Linietsky
eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky
a6ac1fcd94 Merge pull request #2983 from koalefant/vector_ptr
Vector<>::_ptr is now typed and points to the beginning of the array rather than refcounting block
2015-12-08 17:02:13 -03:00
Juan Linietsky
7ba484bc74 some fixes
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
2015-12-06 20:22:45 -03:00
Franklin Sobrinho
3c4b0236cb Add constructor for Image built-in type 2015-12-06 09:12:14 -03:00
Juan Linietsky
fe2a9bc746 optional streaming from thread for Theora 2015-12-05 23:16:41 -03:00
Juan Linietsky
200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
koalefant
c7b730c655 Vector<>::_ptr is now typed and points to the beginning of array rather than reference count block 2015-12-04 05:58:56 +01:00
est31
e1d02e4831 Make the setting unix-only.
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
admix
bc998c9195 fixed crash when creating new object with wrong number of arguments 2015-11-28 17:30:59 +01:00
Juan Linietsky
082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky
ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
est31
a23e29ab36 Correct retvals of String::to_ascii() and String::to_utf8()
Both return RawArray, not String.

My fault from commit f83f96cb44.
2015-11-24 05:11:39 +01:00
Rémi Verschelde
a961347d8c Fix return type of Matrix32 member vars
Thanks to @bojidar-bg for localising the issue.
2015-11-23 19:08:54 +01:00
Rémi Verschelde
74e0c76216 Merge pull request #2788 from masoudbh3/pck-file-name
Load binaryname.pck
2015-11-23 09:59:48 +01:00
Rémi Verschelde
5a35bb903d Merge pull request #1820 from guilhermefelipecgs/master
Remove duplicated filter, Fix #1795
2015-11-23 00:22:35 +01:00
masoud bh
6277fe3078 add priority to load binaryname.pck 2015-11-20 12:47:55 +03:30
masoud bh
6f718228d4 Load binaryname.pck
if not found data.pck search for binaryname.pck in linux and windows
2015-11-20 12:47:55 +03:30
Rémi Verschelde
f7e4c4e359 Fix call to _snprintf on GCC
Was a regression from ddbf2ff.
This commit also introduce a "#define snprintf _snprintf", so the rest of the file was simplified to make use of this
instead of distinguishing between snprintf and _snprintf in the various functions.
2015-11-20 00:30:35 +01:00
Juan Linietsky
2769da7744 compile fixes 2015-11-19 20:24:43 -03:00
Ariel Manzur
ddbf2ffd1d fix compile error in some msvc version (snprintf not found) 2015-11-19 18:09:57 -03:00
Juan Linietsky
fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/export/export.h
2015-11-19 10:44:13 -03:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Aren Villanueva
5c7e9e7e63 Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break.
Documentation for HTTPClient.
Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages.
String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
2015-11-19 22:01:42 +11:00
Juan Linietsky
0168947084 Merge pull request #2518 from masoudbh3/godot-icons
Add icon to exe file in windows export
2015-11-19 00:08:47 -03:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky
63e84e1824 Merge pull request #2798 from bojidar-bg/patch-6
Change handling of invalid JSON escape sequences.
2015-11-18 19:41:46 -03:00
Juan Linietsky
f738906519 Merge pull request #2737 from akien-mga/type-specific-error-output
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
2015-11-18 18:58:22 -03:00
Juan Linietsky
5dcfdb3435 Merge pull request #2749 from TheHX/fix_string_content_test
Fix String content test
2015-11-18 18:55:01 -03:00
Bojidar Marinov
f59a1fd50d Change handling of invalid JSON escape sequences.
Instead of reporting an error, just ignore the first backslash and continue.
Fixes #2521
2015-11-16 17:05:39 +02:00
Franklin Sobrinho
541812e999 Implement Quat multiply operator, and xform method 2015-11-11 11:30:55 -03:00
Rémi Verschelde
6334895088 Display error type (error, warning, script error) in OS::print_error
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
2015-11-10 18:29:34 +01:00
masoud bh
24f3f43457 Add icon to exe file in windows export
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
2015-11-09 02:23:58 +03:30
Franklin Sobrinho
d5fbd1d262 Fix String content test 2015-11-06 18:52:15 -03:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Juan Linietsky
d123c89c58 -fixed a quite serious scene corruption bug when saving that has been around for months.
good thing no one ran into it :P
2015-10-21 23:57:43 -03:00
Juan Linietsky
35959f9c5a -fixes to ring buffer (fixes network error)
-fixes to invalid disabling of commands on scene tree dock
2015-10-21 16:52:43 -03:00
Juan Linietsky
b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky
1db523d0bb Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
Juan Linietsky
253d34b937 Merge pull request #2256 from sheepandshepherd/list-edits
List::move_before updates front/back pointers, fixes #2255
2015-10-17 12:10:42 -03:00
Juan Linietsky
0bc6a8894c Merge pull request #2266 from MrGreenTea/master
added floor() and ceil() to Vector3
2015-10-17 12:10:32 -03:00
Juan Linietsky
b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
Juan Linietsky
1028ab9d81 Merge pull request #2520 from bojidar-bg/patch-3
Add missing \n to world_wrap.
2015-10-17 10:07:08 -03:00
Juan Linietsky
99a3c1aaa1 Merge pull request #2531 from bojidar-bg/patch-4
Fix parameters of funcRef::call_func
2015-10-17 10:06:03 -03:00
Juan Linietsky
f259f9cbc3 Merge pull request #2584 from buresu/fix-parentheses-equality-warnings
[OSX Clang] Fix parentheses-equality warnings
2015-10-17 09:48:06 -03:00
MarianoGNU
a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz
17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
Juan Linietsky
79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
reduz
6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
reduz
422929e87f Large improvements on scene packing and management
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03:00
近藤 直人
bbca86577d fix parentheses-equality warnings of osx clang 2015-10-09 21:39:50 +09:00
reduz
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
Juan Linietsky
e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
2015-10-01 16:25:36 -03:00
Rémi Verschelde
1e147c4945 Fix some copy-paste mistakes in linear/db volume functions 2015-09-26 21:06:12 +02:00
Bojidar Marinov
a0dffc2942 Update mi.name 2015-09-25 18:51:04 +03:00
Bojidar Marinov
721d9a58c7 Removed a badly listed parameter from funcRef::call_func... 2015-09-25 18:41:42 +03:00
Juan Linietsky
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Bojidar Marinov
d9583f8a72 Add missing \n to world_wrap. Close #2516
The issue was that world_wrap would skip over newlines, without adding them to the output.
2015-09-24 10:17:06 +03:00
Bojidar Marinov
ca11b2fa4b Fix _xml_unescape, as suggested by @reduz 2015-09-23 21:40:24 +03:00
Bojidar Marinov
a7f0846a6b Flip &lt; and &gt; in String::xml_escape. Close #2511
Before > referred to &lt; and < to &gt;, which is incorrect...
2015-09-23 21:33:31 +03:00
Juan Linietsky
ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -03:00
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Mariano Javier Suligoy
c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy
ea448cb779 Edit default values. WARNING!!!
Do not merge these changes, default values are not compiled into shaders yet!
2015-08-29 21:09:11 -03:00
Juan Linietsky
b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
Juan Linietsky
b0be30d9ef make sure array is created if not existing, as noted by Guilherme Felipe 2015-08-25 23:09:41 -03:00
Juan Linietsky
d50921b550 Show documentation for properties on hover.
This works if the property has been documented (about half are at this point)
2015-08-25 23:00:11 -03:00
Juan Linietsky
4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky
07e9741425 **WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
2015-08-23 20:15:56 -03:00
Maximillian
6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
Juan Linietsky
9d185ccc30 -Merged the file server with the live editing and remote debug
-It is now really easy to deploy an android build with debug, and debug it
2015-08-06 02:37:40 -03:00
Juan Linietsky
8280bb0de0 more debugger fixes
-setting/clearing breakpoints during run-time now works
-multi-line strings resulted in wrong line numbers in bytecode, fixed
2015-08-04 20:17:39 -03:00
Juan Linietsky
09a2de9916 added bindings for screen rotation in OS 2015-08-04 18:09:51 -03:00
Juan Linietsky
d1da2c2995 error debugger
shows the list of errors that happened during running the game, traces
can be analyzed
2015-08-04 09:47:32 -03:00
Juan Linietsky
cbee679bd7 live debug fixes
removing node in live debugging fixed
2015-08-02 20:28:10 -03:00
Juan Linietsky
59961c9914 Live edit WORK IN PROGRESS
1) press the heart while the game is running
2) select a scene to live edit from the opened scenes
3) edit/add/remove nodes or resources, change their properties, etc.
4) watch changes reflected in running game, in all places this scene is
edited
5) It's not perfect obviously, but the aim of it is to try to reflect
your changes as best as possible in the running game.
2015-08-02 12:30:01 -03:00
punto-
922356b903 adding some base64 marshalls 2015-07-28 12:50:52 +02:00
MrGreenTea
ec11762006 added floor() and ceil() to Vector3 2015-07-15 01:59:35 +02:00
sheepandshepherd
db440a2a58 Fix List::move_before for front and back elements 2015-07-10 21:33:44 +02:00
Juan Linietsky
b4d5f7e154 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-30 11:59:33 -03:00
Juan Linietsky
4613a3f2c0 small fixes 2015-06-30 11:59:00 -03:00
Juan Linietsky
55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky
95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
Juan Linietsky
a67486a39e improved get_node(), connect(), etc code completion.
-properly completes text arguments
-includes the "/root" autoloads
2015-06-26 01:14:49 -03:00
Juan Linietsky
48f1d02da4 added ability to define signals in script
closes #2175
2015-06-24 13:29:45 -03:00
Jaguar
e6fb0cf970 Added helper methods to InputEvent 2015-06-23 16:24:48 -04:00
Juan Linietsky
3abb54871f Merge pull request #2072 from jrimclean/master
Interpolation for affine transformations/Bound rot/pos Matrix32 constructor
2015-06-22 23:57:10 -03:00
Juan Linietsky
0805e83e59 small in place fixes 2015-06-22 23:44:13 -03:00
Juan Linietsky
29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix
added GDscript bidings for UndoRedo class
2015-06-22 23:42:13 -03:00
krzycho
fafcc52d1c added some missing biddings 2015-06-22 14:42:52 +02:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE*
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
2015-06-22 00:04:15 -03:00
krzycho
d65455185a - added GDscript bidings for UndoRedo class mechanizm
- registered UndoRedo
2015-06-21 22:23:09 +02:00
Juan Linietsky
8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky
4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
James McLean
2e6d3b7fad Changed floats to 'real_t'. 2015-06-11 21:37:54 -04:00
James McLean
c2181285eb Changed 'scale' to 'scale_basis' in 'interpolate_with'. 2015-06-11 13:44:04 -04:00
James McLean
b19ed63eb6 Implemented interpolation for affine transformations (Matrix32::interpolate_with) 2015-06-11 10:43:48 -04:00
James McLean
bb659fa875 Added rot/pos constructor for Matrix32 variant. 2015-06-09 10:55:23 -04:00
James McLean
45b453169a Fixed get_packet/put_packet bindings in PacketPeer. 2015-06-08 13:18:18 -04:00
Juan Linietsky
8d61817293 Merge pull request #2037 from est31/use-local-win
Time zone support
2015-06-07 00:32:29 -03:00
Juan Linietsky
efbe877005 Merge pull request #2029 from est31/rawarray
Add String.to_utf8() and String.to_ascii()
2015-06-07 00:30:37 -03:00
Juan Linietsky
e4434fe70e Merge pull request #1977 from choikwa/master
fix typo error in Color::invert, fixes #1967
2015-06-07 00:28:50 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues
-fixed deadlock on previews thread
-fixed compilation errors on unix
2015-06-06 22:06:58 -03:00
Juan Linietsky
6974823288 Merge remote-tracking branch 'origin/master'
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
2015-06-06 10:12:09 -03:00
Juan Linietsky
9acab32daa new file dialog!
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
2015-06-06 09:44:38 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
2015-06-06 05:55:28 +02:00
est31
f83f96cb44 Add String.to_utf8() and String.to_ascii() 2015-06-04 01:48:52 +02:00
Juan Linietsky
ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
2015-06-01 19:42:34 -03:00
Kevin Choi
6813a1f1e1 Merge pull request #2 from okamstudio/master
pull
2015-05-31 01:37:56 -04:00
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
Juan Linietsky
57a78ec06b added conversion from int, string to color
fixes #1971
2015-05-27 10:56:57 -03:00
Juan Linietsky
9df77d2765 ability to run 2D physics in a thread
also, 2D physics is now thread safe too.
see physics_2d/thread_model
2015-05-26 01:06:05 -03:00
Ariel Manzur
3826b66a6e opening data.pcz 2015-05-25 22:42:54 -03:00
Ariel Manzur
c85a526a21 fixed support for zip packages 2015-05-25 22:35:00 -03:00
Kevin Choi
ec93668f8d Merge pull request #1 from okamstudio/master
improved animation editor
2015-05-25 00:54:24 -04:00
Juan Linietsky
f36e7dcb40 improved animation editor
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
2015-05-25 01:47:02 -03:00
choikwa
b210f52f4a fix typo error in Color::invert 2015-05-24 19:07:26 -04:00
Juan Linietsky
1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky
221443c5a2 more fixes
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
2015-05-19 21:36:35 -03:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky
5900e7f589 fix a compile error 2015-05-18 11:14:02 -03:00
Juan Linietsky
e323cc0505 -Rename unexisting by nonexistant, closes #1940
-Added function to retrieve list of actions fron InputMap
2015-05-18 10:20:54 -03:00
Juan Linietsky
e72717e373 properly save external resources, fixes #1924
added API to get scancode names to OS
2015-05-17 13:15:23 -03:00
Juan Linietsky
adb709aa91 -Integers and Float should interpolate on animation, maybe fixes #1891, please test 2015-05-16 18:16:11 -03:00
Juan Linietsky
40c0e1993a Fixes problem parsing config files using ConfigFile 2015-05-12 09:12:18 -03:00
Juan Linietsky
bcb184766f -shadergraph now saved when on external file and modified, fixes #1832 2015-05-11 21:36:29 -03:00
Juan Linietsky
9b692b174b -convert to subscene keeps signal connections, fixes #1863 2015-05-10 15:45:33 -03:00
Juan Linietsky
7c4a35496a Merge pull request #1844 from daltomi/SIGSEGV
Fix segment violation MINIZIP_ENABLED
2015-05-07 20:03:25 -03:00
Juan Linietsky
c99813dc38 Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
2015-05-07 20:02:54 -03:00
Daniel T. Borelli
93095014fd Fix segment violation MINIZIP_ENABLED 2015-05-06 20:37:25 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
Guilherme Felipe
734d539a7d Change the order of the filter 2015-05-05 15:34:40 -03:00
Guilherme Felipe
6e98b05837 Remove duplicated filter, Fix #1795 2015-05-05 14:16:59 -03:00
Juan Linietsky
bc3c14a76b Made type-checking for arguments less trict between bool, int real. Fixes #1816 2015-05-05 09:53:37 -03:00
Juan Linietsky
a6e6c5b878 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 18:32:18 -03:00
Juan Linietsky
2d396fb710 -More strict argument type-checking, will make many bugs visible, fixes #1809
-added NOTIFICATION_INSTANCED
2015-05-04 18:30:57 -03:00
Juan Linietsky
2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Juan Linietsky
6f8bd89931 -invalidated string -> int automatic conversion, fixes #1788 2015-05-04 11:17:11 -03:00
Juan Linietsky
a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky
9b01f5954a solve invalid pointer, fixes #1793 2015-05-04 00:55:21 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes
Static analysis fixes
2015-05-03 22:53:30 -03:00
Juan Linietsky
913cb443fc Merge pull request #1798 from ricpelo/ricpelo-patch-1
Missing return statement
2015-05-03 22:52:42 -03:00
Juan Linietsky
04fb3402c5 -Make sure properties are exported the way they should in xml, fixes #1799 2015-05-03 20:31:50 -03:00
Ricardo Pérez
256a9fd1df Missing return statement 2015-05-03 22:09:42 +02:00
Simon Wenner
a0e985c6c1 removed unnecessary semicolons 2015-05-03 01:48:20 +02:00
Simon Wenner
2830f85b05 fixed uninitialized variable (cppcheck) 2015-05-03 01:45:55 +02:00
Juan Linietsky
1e422941c8 -Fixed android export options (screen sizes, orientation should work)
-added functions to get mouse position in CanvasItem
2015-05-01 21:13:20 -03:00
Juan Linietsky
ee8f8add4e -removed get_mouse_pos from Input, as it only caused problems 2015-05-01 12:19:24 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
est31
b2b5143678 Sort xml files, so order is constant
Makes xml format work better with version control systems.
2015-05-01 03:41:45 +02:00
romulox_x
79c36ea5f7 fixed ColorArray constructor when taking array as parameter 2015-04-27 14:45:54 -07:00
Juan Linietsky
3203a03414 Fixed bug in array comparison, fixes #1712 2015-04-26 12:12:53 -03:00
Juan Linietsky
1f8e3117dd Ability to convert from nodes or other non resource with a get_rid() function to a rid 2015-04-24 20:45:07 -03:00
Juan Linietsky
7006fe3cc4 Corrected rectangle intersection, fixes #1731 2015-04-24 16:08:05 -03:00
Juan Linietsky
66c71c21df resolved some cases wehre built-in doc is not properlt generated, fixes #1719 2015-04-22 00:25:13 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean.
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 19:38:02 -03:00
Juan Linietsky
b66b86b05e -Fixed post-import script-reload buf, fixes #1683 2015-04-18 19:06:58 -03:00
Juan Linietsky
a5cbfbbcbb -fixed relative path saving to file, fixes #1694 2015-04-18 16:33:31 -03:00
Juan Linietsky
4661a6e126 -try to avoid errors when path using ".." is present in script include, fixes #1703 2015-04-18 16:17:33 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
6b3cd13c8d -fix vector rotation, fixes #1705 2015-04-18 14:19:33 -03:00
Juan Linietsky
28304bc330 -Changed the cubic interpolator, improves situation with PathFollow in #1659 2015-04-13 09:47:03 -03:00
Juan Linietsky
8fa4f1cf82 -Made sure that "free" function appears in documentation and code completion, fixes #1664 2015-04-12 22:22:44 -03:00
Juan Linietsky
3e20391bf6 -Changed bootsplash option to use a file, fixes #1539
-Added OS.get_splash_tick_msec() to query when splash appeared
2015-04-12 17:55:01 -03:00
Juan Linietsky
2dfa1279ea improved save path error messages for scene, textures and audio, fixes #1514 2015-04-12 16:45:59 -03:00
Juan Linietsky
3b35bcc955 -fix resolver erase query to avoid running out of slots, fixes #1621 2015-04-07 22:45:33 -03:00
Juan Linietsky
963845eea9 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-07 21:21:06 -03:00
Juan Linietsky
22997294fa -Concatenating arrays keeps the shared property if any of the arrays is shared. Fixes #1646 2015-04-07 21:18:46 -03:00
Juan Linietsky
e336306e91 Merge pull request #1554 from NateWardawg/inspectorupdate
Camel casing being capitalized only happens in the inspector now.
2015-04-07 20:22:09 -03:00
Juan Linietsky
219fce737c Merge pull request #1564 from Faless/area_combine-1
Implement combine mode for area
2015-04-07 20:21:11 -03:00
Juan Linietsky
7b75658bb2 Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects
add : bool Object.is_queued_for_deletion()
2015-04-07 20:14:51 -03:00
Juan Linietsky
7978245784 Merge pull request #1614 from hurikhan/pr_parameter_names
wm api -- set screen parameter names for gdscript
2015-04-07 20:11:53 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
hurikhan
af368b7e1a set screen parameter names for gdscript 2015-04-03 15:00:55 -04:00
Juan Linietsky
1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
UsernameIsAReservedWord
9cca88eb92 Update object.h 2015-03-28 18:42:01 +01:00
yg2f
3c67e22c3d add : bool Object.is_queued_for_deletion()
`object.is_queued_for_deletion()` return true if the object was
`object.queue_free()` or `SceneTree.queue_delete(object)`.
2015-03-28 18:34:28 +01:00
Fabio Alessandrelli
4b3b5eba86 Use Vector for storing areas 2015-03-24 18:46:26 +00:00
Nathan Warden
21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05:00
Juan Linietsky
0dcca688d2 Revert "Camelcased script variables will now capitalize in the inspector." 2015-03-22 19:06:13 -03:00
Juan Linietsky
23e13ce3c2 fixes to new window management API
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
2015-03-22 19:00:50 -03:00
Juan Linietsky
15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management
X11 window management
2015-03-22 15:10:50 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal
Changed code to remove gcc -Wparentheses warnings.
2015-03-22 15:05:47 -03:00
Juan Linietsky
0302ea5b82 Merge pull request #1396 from Spooner/fix_sprintf_errors
Fix sprintf errors
2015-03-22 15:03:32 -03:00
Juan Linietsky
7436f0bb37 Merge pull request #1401 from NateWardawg/inspectorupdate
Camelcased script variables will now capitalize in the inspector.
2015-03-22 15:02:42 -03:00
Juan Linietsky
3aed92e5b1 Merge pull request #1450 from theuserbl/master
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
2015-03-22 14:58:42 -03:00
Juan Linietsky
4069dc7891 Merge pull request #1521 from codx/master
Fix for InputEvent::set_as_action
2015-03-22 14:48:54 -03:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Alex Bonfim
2d4cad7057 Fix for InputEvent::set_as_action 2015-03-15 23:17:48 -03:00
hurikhan
87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
2015-03-03 14:41:36 -03:00