Rémi Verschelde
7b059965e8
Adapt platforms to AudioServer refactoring
...
Fixes compilation on Windows and likely other platforms (at least
as far as AudioServer changes were concerned), though they were
not tested.
2017-01-16 19:19:45 +01:00
Rémi Verschelde
6a3dae5be9
zlib: Update to upstream version 1.2.11
2017-01-16 17:58:34 +01:00
Jerome67000
8c19a6cb85
#7215 try to fix adb bad targeting user on device
2017-01-16 17:53:12 +01:00
Rémi Verschelde
ed96a3da8d
Merge pull request #7553 from Faless/tcp-win-fix
...
Fix bug in windows TCP poll function
2017-01-16 16:00:23 +01:00
Fabio Alessandrelli
c356ec5e8b
Fix bug in windows TCP poll function
...
Bug introduced when implementing TCP disconnection detection.
(too much yank-paste).
Fixes #7545
2017-01-16 15:50:20 +01:00
Rémi Verschelde
0c80bc2579
Merge pull request #7457 from BastiaanOlij/glew3-ios
...
Working on compile issues for iOS
2017-01-16 13:47:01 +01:00
BastiaanOlij
3a02df7739
Working on compile issues for iOS
2017-01-16 23:14:13 +11:00
Rémi Verschelde
eeea116022
Merge pull request #7548 from BastiaanOlij/audio3-osx
...
Fix compile errors related to audio on OSX
2017-01-16 11:05:15 +01:00
BastiaanOlij
cef0ae5d5d
Fix compile errors related to audio on OSX
2017-01-16 20:32:44 +11:00
Rémi Verschelde
2a0ddc1e89
Style: Various fixes to play nice with clang-format
2017-01-16 08:49:52 +01:00
Rémi Verschelde
39114178a0
Style: Prevent clang-format on JS code
2017-01-16 08:49:52 +01:00
Rémi Verschelde
f44ee891be
Style: Fix statements ending with ';;'
2017-01-16 08:49:52 +01:00
Rémi Verschelde
e2a3f06f3d
Style: Keep long lines for now
...
clang-format does not play well with tab-aligned multiline statements...
Some more research will be needed if we want to set a column limit.
2017-01-16 08:48:24 +01:00
Rémi Verschelde
40323407df
Style: No break before list brace
...
clang-format does not handle that well *at all*.
For the reference, found the relevant pieces of code with:
`ag "=[ "$'\t'"]?"$'\n'"[ "$'\t'"]?{" --ignore=thirdparty`
2017-01-16 08:48:24 +01:00
Rémi Verschelde
3890256fc5
Style: Cleanups, added headers, renamed files
...
Made sure files in core/ and tools/ have a proper Godot license header
when written by us. Also renamed aabb.{cpp,h} and object_type_db.{cpp,h}
to rect3.{cpp,h} and class_db.{cpp,h} respectively.
Also added a proper header to core/io/base64.{c,h} after clarifying
the licensing with the original author (public domain).
2017-01-16 08:04:23 +01:00
Juan Linietsky
b400c69cd4
Oops! Audio engine has vanished :D
2017-01-15 16:07:51 -03:00
Franklin Sobrinho
b24b52d56b
Add a API to add/remove items to the "Tools" menu
2017-01-15 16:42:24 +01:00
Rémi Verschelde
e0faf8a51b
Style: Cosmetic fixes to play nice with clang-format
2017-01-15 16:42:17 +01:00
Juan Linietsky
52e2a1e98d
fixed to 2D physics, makes it work again
2017-01-15 09:50:27 -03:00
Juan Linietsky
a7854d3ae6
2D and 3D viewport are working again :D
2017-01-15 09:50:27 -03:00
Rémi Verschelde
5e13a762ec
Add missing map.h include in color defs
2017-01-15 12:51:47 +01:00
Rémi Verschelde
82d087638d
Merge pull request #7534 from RayKoopa/gitignore_vs2015
...
.gitignore: Added VC++ cache database and temporary storage folder when debugging
[ci skip]
2017-01-15 10:58:12 +01:00
Ray Koopa
3494ff5b39
Added VC++ cache database and temporary storage folder when running
2017-01-15 10:47:50 +01:00
Rémi Verschelde
47365e068e
Merge pull request #7533 from GodotExplorer/pr-json-empty-string
...
Fix error while JSON::parse with empty string
2017-01-15 10:45:41 +01:00
Geequlim
c8e9937e21
Fix error while JSON::parse with empty string
2017-01-15 16:59:02 +08:00
Juan Linietsky
5dde810aa5
no more errors related to missing GlobalConfig::Get (or so I hope)
2017-01-14 21:57:22 -03:00
Wilhem Barbier
a1d07fd6d6
Allow closing a script tab without saving
2017-01-15 00:35:52 +01:00
Rémi Verschelde
07f65184f3
Merge pull request #7519 from eska014/web-presentation
...
Improve Web export presentation
2017-01-15 00:30:52 +01:00
Rémi Verschelde
fe8459ac3b
Merge pull request #7515 from kbake/issue7433
...
Use Animation's Name as Filename When Saving
2017-01-15 00:29:04 +01:00
Daniel Ramirez
1d7d8e1674
Added missing icons ( #7514 )
2017-01-15 00:28:12 +01:00
Rémi Verschelde
a540e15cd1
Merge pull request #7513 from djrm/compilation_fix
...
Matrix32 -> Transform2D
2017-01-15 00:27:05 +01:00
Rémi Verschelde
a992d3f74f
Merge pull request #7510 from Faless/tcp_connect
...
TCP connect always opens the correct socket type
2017-01-15 00:26:46 +01:00
Rémi Verschelde
d4eb8ec884
Merge pull request #7127 from BastiaanOlij/ios_meters
...
Core motion implementation for iPhone (Accelerometer/Gyro/Magnetometer support)
2017-01-15 00:08:46 +01:00
James Mintram
dab73c701a
Compile error when duplicate key in dictionery literal #7034
2017-01-14 22:08:49 +01:00
Rémi Verschelde
8d3aedeefd
MethodBind: Make sure header order is kept
...
When clang-format sorts includes alphabetically, MethodBind breaks.
Trying to move the object.h include upward in method_bind.h does
not seem to fix the problem, this needs investigation.
2017-01-14 22:07:28 +01:00
Juan Linietsky
4261880c94
Merge pull request #6845 from karroffel/master
...
Adds pattern matching to GDScript
2017-01-14 17:08:10 -03:00
Juan Linietsky
7924f08a6a
Merge pull request #4918 from jjay/f/error_on_redefine
...
Redefine var results in an error
2017-01-14 17:07:08 -03:00
Juan Linietsky
94609305a0
Merge pull request #6519 from RandomShaper/enhance-tileset
...
Add modulate (color) to TileSet tiles
2017-01-14 16:52:16 -03:00
kbake
a533402695
Will now try to use the existing animation's name for filename, defaults to previous value in case there's no name
2017-01-14 14:45:42 -05:00
Rémi Verschelde
52666b88b3
Merge pull request #7525 from neikeq/pr-plus_file
...
String: plus_file(String) no longer adds a root
2017-01-14 19:53:35 +01:00
Ignacio Etcheverry
a49e75e374
Merge pull request #7526 from nounoursheureux/fix-getcurrentdrive
...
Fix _Directory::get_current_drive error condition from breaking the build
2017-01-14 18:55:19 +01:00
Wilhem Barbier
54b20874b6
Fix _Directory::get_current_drive error condition
2017-01-14 18:47:06 +01:00
Ignacio Etcheverry
95396067b7
String: plus_file(String) no longer adds a root
2017-01-14 18:18:44 +01:00
Rémi Verschelde
ce99286362
Merge pull request #7524 from neikeq/pr-dir-getcurdrive
...
Directory: Bind get_current_drive() method
2017-01-14 17:22:06 +01:00
Ignacio Etcheverry
0b2ae7313b
Directory: Bind get_current_drive() method
2017-01-14 17:20:16 +01:00
Rémi Verschelde
479790a841
StreamPeerWinsock: Fix changed declarations
...
Bug introduced in dcb95ec147
.
2017-01-14 16:23:01 +01:00
Juan Linietsky
7c4167de64
Merge pull request #7010 from AlexHolly/format-string2
...
advanced string format
2017-01-14 11:56:24 -03:00
Rémi Verschelde
f4897fccf0
DirAccessWindows: Fix list_dir_begin return type
...
Fixes bug introduced in da4170540c
.
2017-01-14 15:26:01 +01:00
Juan Linietsky
dcb95ec147
removed duplicated functions in class hierarchy that were bound more than once
...
added a check to detect this case in the future
2017-01-14 11:10:42 -03:00
eska
1f7d4c4d0e
Improve usability and style in web export presentation
...
- Check for WebGL support, don't load if unsupported
- Check for IndexedDB support
- Make canvas support check message visible
- Colored debug output for warnings and errors
- Make it obvious status can be closed by clicking
- Don't use status to display non-critical errors
- Limit output message count
- Add clear output button
- Fix setting total memory
2017-01-14 14:53:40 +01:00