68aaa0f813
Merge branch 'master' of https://github.com/godotengine/godot
2015-11-28 20:57:23 -03:00
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
bc998c9195
fixed crash when creating new object with wrong number of arguments
2015-11-28 17:30:59 +01:00
082e3fbb29
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
main/main.cpp
2015-11-24 10:52:41 -03:00
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
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
a961347d8c
Fix return type of Matrix32 member vars
...
Thanks to @bojidar-bg for localising the issue.
2015-11-23 19:08:54 +01:00
74e0c76216
Merge pull request #2788 from masoudbh3/pck-file-name
...
Load binaryname.pck
2015-11-23 09:59:48 +01:00
5a35bb903d
Merge pull request #1820 from guilhermefelipecgs/master
...
Remove duplicated filter, Fix #1795
2015-11-23 00:22:35 +01:00
6277fe3078
add priority to load binaryname.pck
2015-11-20 12:47:55 +03:30
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
2769da7744
compile fixes
2015-11-19 20:24:43 -03:00
ddbf2ffd1d
fix compile error in some msvc version (snprintf not found)
2015-11-19 18:09:57 -03:00
fd5ee87c24
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
platform/windows/export/export.h
2015-11-19 10:44:13 -03:00
d3eb9e8c54
-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260
2015-11-19 10:41:20 -03:00
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
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
0c3386b2ed
Merge pull request #2707 from akien-mga/master
...
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
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
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
5dcfdb3435
Merge pull request #2749 from TheHX/fix_string_content_test
...
Fix String content test
2015-11-18 18:55:01 -03:00
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
541812e999
Implement Quat multiply operator, and xform method
2015-11-11 11:30:55 -03:00
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
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
d5fbd1d262
Fix String content test
2015-11-06 18:52:15 -03:00
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
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
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
b59c86f6f9
-Ability to debug video memory usage
...
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
1db523d0bb
Merge pull request #2274 from MarianoGnu/master
...
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
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
0bc6a8894c
Merge pull request #2266 from MrGreenTea/master
...
added floor() and ceil() to Vector3
2015-10-17 12:10:32 -03:00
b217e1417a
Merge pull request #2479 from firefly2442/cppcheck-unusedvars
...
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
1028ab9d81
Merge pull request #2520 from bojidar-bg/patch-3
...
Add missing \n to world_wrap.
2015-10-17 10:07:08 -03:00
99a3c1aaa1
Merge pull request #2531 from bojidar-bg/patch-4
...
Fix parameters of funcRef::call_func
2015-10-17 10:06:03 -03:00
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
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
17a90ddc08
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
79e5ced7e6
-A little More control about pixel snapping in 2D
2015-10-13 15:53:34 -03:00
6b20ee4324
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-10 09:09:59 -03:00
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
aad2bbdb6f
newline fixes
2015-10-08 15:00:40 -03:00
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
1e147c4945
Fix some copy-paste mistakes in linear/db volume functions
2015-09-26 21:06:12 +02:00
a0dffc2942
Update mi.name
2015-09-25 18:51:04 +03:00
721d9a58c7
Removed a badly listed parameter from funcRef::call_func...
2015-09-25 18:41:42 +03:00
9962518ffd
Merge branch 'master' of https://github.com/okamstudio/godot
2015-09-24 18:07:13 -03:00
82a3304458
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 18:06:15 -03:00
Juan Linietsky
admix
est31
Rémi Verschelde
Rémi Verschelde
masoud bh
Ariel Manzur
Aren Villanueva
Bojidar Marinov
Franklin Sobrinho
MarianoGNU
reduz
近藤 直人