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

..

bind

Properly implement OS.alert() from script, and use xmessage on X11

2015-09-21 09:39:46 -03:00

io

newline fixes

2015-10-08 15:00:40 -03:00

math

Fix some copy-paste mistakes in linear/db volume functions

2015-09-26 21:06:12 +02:00

os

-A little More control about pixel snapping in 2D

2015-10-13 15:53:34 -03:00

allocators.h

-try to avoid errors when path using ".." is present in script include, fixes #1703

2015-04-18 16:17:33 -03:00

array.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

array.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

balloon_allocator.h

-try to avoid errors when path using ".." is present in script include, fixes #1703

2015-04-18 16:17:33 -03:00

color.cpp

fix typo error in Color::invert

2015-05-24 19:07:26 -04:00

color.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

command_queue_mt.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

command_queue_mt.h

-fixed many memory initialization issues

2015-06-06 22:06:58 -03:00

compressed_translation.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

compressed_translation.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

core_string_names.cpp

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

core_string_names.h

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

dictionary.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

dictionary.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

dvector.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

dvector.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

error_list.h

**WARNING BEFORE PULLING**

2015-08-23 20:15:56 -03:00

error_macros.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

error_macros.h

merged some stuff for okam

2015-09-03 23:24:55 -03:00

event_queue.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

event_queue.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

fpstr.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

fpstr.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

func_ref.cpp

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

func_ref.h

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

global_constants.cpp

**WARNING BEFORE PULLING**

2015-08-23 20:15:56 -03:00

global_constants.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

globals.cpp

merged some stuff for okam

2015-09-03 23:24:55 -03:00

globals.h

-some changes by okam

2015-06-30 11:28:43 -03:00

hash_map.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

hashfuncs.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

image_quantize.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

image.cpp

-Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)

2015-10-01 16:25:36 -03:00

image.h

-Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)

2015-10-01 16:25:36 -03:00

input_map.cpp

fix a compile error

2015-05-18 11:14:02 -03:00

input_map.h

-Rename unexisting by nonexistant, closes #1940

2015-05-18 10:20:54 -03:00

int_types.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

list.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

make_binders.py

Small Fixes

2014-09-17 11:53:29 -03:00

map.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

message_queue.cpp

-fixed many memory initialization issues

2015-06-06 22:06:58 -03:00

message_queue.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

method_bind.cpp

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

method_bind.h

-Rename unexisting by nonexistant, closes #1940

2015-05-18 10:20:54 -03:00

multi_bucket_array.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

object_type_db.cpp

Show documentation for properties on hover.

2015-08-25 23:00:11 -03:00

object_type_db.h

Show documentation for properties on hover.

2015-08-25 23:00:11 -03:00

object.cpp

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

object.h

Edit default values. WARNING!!!

2015-08-29 21:09:11 -03:00

packed_data_container.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

packed_data_container.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

pair.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

pair.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

path_db.cpp

Large improvements on scene packing and management

2015-10-10 09:09:09 -03:00

path_db.h

Large improvements on scene packing and management

2015-10-10 09:09:09 -03:00

path_remap.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

path_remap.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

pool_allocator.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

pool_allocator.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

print_string.cpp

-some changes by okam

2015-06-30 11:28:43 -03:00

print_string.h

-some changes by okam

2015-06-30 11:28:43 -03:00

ref_ptr.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

ref_ptr.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

reference.cpp

-Fixed post-import script-reload buf, fixes #1683

2015-04-18 19:06:58 -03:00

reference.h

missing changes

2015-06-14 02:13:47 -03:00

register_core_types.cpp

-Changed Godot exit to be clean.

2015-04-20 19:38:02 -03:00

register_core_types.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

res_ptr.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

res_ptr.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

resource.cpp

Multiple scene editing *POTENTIALLY UNSTABLE*

2015-06-22 00:04:15 -03:00

resource.h

Large improvements on scene packing and management

2015-10-10 09:09:09 -03:00

rid.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

rid.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

ring_buffer.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

safe_refcount.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

safe_refcount.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

script_debugger_debugger.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

script_debugger_local.cpp

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

script_debugger_local.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

script_debugger_remote.cpp

-Merged the file server with the live editing and remote debug

2015-08-06 02:37:40 -03:00

script_debugger_remote.h

error debugger

2015-08-04 09:47:32 -03:00

script_language.cpp

improved get_node(), connect(), etc code completion.

2015-06-26 01:14:49 -03:00

script_language.h

error debugger

2015-08-04 09:47:32 -03:00

SCsub

Build System Changes

2014-10-07 01:31:49 -03:00

self_list.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

set.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

simple_type.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

sort.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

string_db.cpp

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

string_db.h

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

translation.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

translation.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

typedefs.h

merged some stuff for okam

2015-09-03 23:24:55 -03:00

ucaps.h

Misc Fixes

2014-06-27 23:21:45 -03:00

undo_redo.cpp

Live edit WORK IN PROGRESS

2015-08-02 12:30:01 -03:00

undo_redo.h

Live edit WORK IN PROGRESS

2015-08-02 12:30:01 -03:00

ustring.cpp

Fix _xml_unescape, as suggested by @reduz

2015-09-23 21:40:24 +03:00

ustring.h

Show documentation for properties on hover.

2015-08-25 23:00:11 -03:00

variant_call_bind.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

variant_call.cpp

Added helper methods to InputEvent

2015-06-23 16:24:48 -04:00

variant_construct_string.cpp

begin new serialization framework

2015-02-15 01:21:26 -03:00

variant_op.cpp

-Integers and Float should interpolate on animation, maybe fixes #1891, please test

2015-05-16 18:16:11 -03:00

variant.cpp

merged some stuff for okam

2015-09-03 23:24:55 -03:00

variant.h

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

vector.h

Several performance improvements, mainly in loading and instancing scenes and resources.

2015-06-29 00:29:49 -03:00

vmap.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

vmap.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

vset.cpp

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

vset.h

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00