Commit graph

478 commits

Author SHA1 Message Date
Rémi Verschelde bac8248316 Remove trailing spaces
(cherry picked from commit 0a5472e697)
2016-04-02 22:19:40 +02:00
Hubert Jarosz 424a104666 remove trailing whitespace
(cherry picked from commit 4a4f247914)
2016-04-02 22:03:48 +02:00
Josh Grams ee20365f7c Variant::blend: add Quat, fix Vector3.
(cherry picked from commit f7fad32188)
2016-04-02 22:00:18 +02:00
hondres 656aa0a501 fix InputMap::action_erase_event()
fixes #3976

(cherry picked from commit 9544042adb)
2016-04-02 21:58:26 +02:00
Rémi Verschelde 706d576f7b Add support for patch versions (2.0.x) 2016-03-06 19:05:27 +01:00
Josh Grams cafcdb015d 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.

(cherry picked from commit 391ce81c5e)
2016-03-05 12:55:43 +01:00
est31 b05c27a27f 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-27 15:26:18 +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
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