godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,239 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

6239 Commits

Author SHA1 Message Date
Andrea Faulds c6fa193d66 Scene importer: add -rigidonly flag for empties (fixes #8430) 2017-04-30 16:27:00 +01:00
Rémi Verschelde fb8cee9af9 Ignore gles3 artifacts to ease git branch switching 2017-04-28 15:19:08 +02:00
volzhs e592860145 Show transparency and accurate color for property 2017-04-28 02:09:18 +09:00
Pedro J. Estébanez 9a0e08a352 Add setting to opt-out of capitalization in the property inspector 2017-04-27 08:46:45 +02:00
Rémi Verschelde 6cde867b2f Merge pull request #8536 from volzhs/tr-fallback 
Fix wrong fallback for locale (2.1)
 2017-04-26 08:15:07 +02:00
Rémi Verschelde 8a7ff259cb Merge pull request #8534 from volzhs/android-obb-2.1 
Fix error or download again if use obb for Android (2.1)
 2017-04-26 08:14:48 +02:00
Rémi Verschelde 13b15633d3 Merge pull request #8529 from volzhs/auto-accept-quit 
Fix auto_accept_quit option to work (2.1)
 2017-04-26 08:13:49 +02:00
volzhs cfa943a0eb Fix wrong fallback for locale 2017-04-26 04:45:52 +09:00
volzhs 7919ce782b Fix error or download again if use obb for Android 2017-04-26 03:43:38 +09:00
volzhs edefaa768b Fix auto_accept_quit option to work 
auto_accept_quit value is set first properly with GLOBAL_DEF("application/auto_accept_quit", true) in main.cpp
after that it's reset to true in SceneTree:init() whatever value was.
 2017-04-25 19:54:08 +09:00
Rémi Verschelde ea89c56bfb Merge pull request #8474 from allkhor/pr-fix-cherry-2.1 
ScriptEditor: Fixes bug where menu option would be handled twice (2.1)
 2017-04-24 11:22:14 +02:00
Rémi Verschelde 6aaec01e99 Merge pull request #8272 from MattUV/2.1 
Add methods to get and set bits of collision layers and masks for TileMaps (2.1)
 2017-04-24 11:13:33 +02:00
allkhor b010b4a85c ScriptEditor: Fixes bug where menu option would be handled twice (2.1) 
(cherry picked from commit 97c385d)
 2017-04-21 03:11:32 +06:00
Rémi Verschelde ebddc57eb1 Merge pull request #8466 from RandomShaper/fix-ik-2.1 
Fix IK not being solved while dragging a bone (2.1)
 2017-04-20 16:32:20 +02:00
Pedro J. Estébanez f5be049dd8 Fix IK not being solved while dragging a bone 2017-04-20 16:18:47 +02:00
Rémi Verschelde 90576e0c7a Merge pull request #8358 from volzhs/script-filename-2.1 
Show script filename instead of thumbnail (2.1)
 2017-04-20 02:09:13 +02:00
Rémi Verschelde f9bde9ddf7 Adapt Godot 3 exporter to new project file extension 2017-04-20 01:55:54 +02:00
Rémi Verschelde ef351971d8 Drop EXEC PATHP?? super verbose info message 
It seems to give nightmares to Windows users.

(cherry picked from commit dd55950b62)
 2017-04-20 01:55:54 +02:00
Rémi Verschelde 6b0c384f79 Merge pull request #8442 from volzhs/error-load-icon-2.1 
Fix error for loading icon image at start up
 2017-04-18 00:07:09 +02:00
Rémi Verschelde 5ea3c0350a Merge pull request #8429 from RandomShaper/fix-sample-lib-editor-2.1 
Fix inability to remove samples from libraries (2.1)
 2017-04-17 23:45:13 +02:00
volzhs 8274029e03 Fix error for loading icon image at start up 2017-04-18 04:30:53 +09:00
Pedro J. Estébanez 3922407ceb Fix inability to remove samples from libraries 2017-04-17 00:28:29 +02:00
Andreas Haas 9b44117729 Merge pull request #8390 from volzhs/inspector-button-margin-2.1 
Make buttons closer in Inspector panel (2.1)
 2017-04-14 17:52:28 +02:00
Andreas Haas 0ffa923bca Merge pull request #8369 from volzhs/fix-stylebox-2.1 
Fix editor style box for ToolButton (2.1)
 2017-04-14 17:51:22 +02:00
Andreas Haas 2e68d4b407 Merge pull request #8355 from volzhs/texture-view-2.1 
Prevent to take too much space for long vertical texture (2.1)
 2017-04-14 17:50:45 +02:00
volzhs dc519bf3bb Make buttons closer in Inspector panel 2017-04-13 23:54:33 +09:00
volzhs 4a0aac4fb3 Fix editor style box for ToolButton 2017-04-12 12:20:51 +09:00
Rémi Verschelde d8ae244d51 Revert "Respect style boxes for Button states other than "normal"" 
This reverts commit 98f01f9143.
This made icons in the editor "jumpy" on hover.
 2017-04-11 19:45:39 +02:00
MattUV de96024453 Add set/get_collision_layer/mask_bit() to TileMaps 
Add four methods to the TileMap node to make collision layers and masks be modified bit by bit (like PhysicBody2Ds and RayCast2Ds):

 * set_collision_layer_bit()
 * set_collision_mask_bit()

 * get_collision_layer_bit()
 * get_collision_mask_bit()
 2017-04-11 19:38:14 +02:00
volzhs 72522596a9 Show script filename instead of thumbnail 
fix #7483
 2017-04-12 00:04:57 +09:00
volzhs 21edeebfdb Prevent to take too much space for long vertical texture 
fix #8176
 2017-04-11 20:29:35 +09:00
Rémi Verschelde 8df5b7151f Release 2.1.3-stable 2017-04-10 23:44:55 +02:00
Rémi Verschelde 3b687c5474 Move VERSION_MKSTRING logic to version.h 
Fixes a bug where the VERSION_PATCH define is not yet in scope if
typedefs.h is included before version.h at compilation time.
 2017-04-10 23:08:28 +02:00
Rémi Verschelde c449df86f7 Mark Godot 3.0 exporter as work in progress 2017-04-10 19:40:08 +02:00
Rémi Verschelde 45bf6d9f20 .gitignore: Add app_icon.h and splash.h generated headers 
Also sort alphabetically for clarity.
 2017-04-10 18:36:31 +02:00
Andreas Haas 37d9a7bee4
Re-add ouya gamepad mapping. 
Also adds yet another type of ps4 controller.
 2017-04-10 16:38:44 +02:00
Rémi Verschelde 2515ff5577 Merge pull request #8327 from akien-mga/2.1-godot3-exporter 
Godot3 exporter: Convert engine.cfg properly
 2017-04-09 17:46:56 +02:00
Rémi Verschelde b46d7f986d Merge pull request #8320 from RandomShaper/zero-preprocess-particles2d-2.1 
Allow a preprocess time of 0 for Particles2D (2.1)
 2017-04-09 17:44:23 +02:00
Rémi Verschelde b7e3ef5f6f libpng: Update to upstream version 1.6.29 
(cherry picked from commit d463b6e3d0)
 2017-04-09 15:52:14 +02:00
Rémi Verschelde 2bc0208b2c opus: Update to upstream version 1.1.4 
(cherry picked from commit dd8655aac9)
 2017-04-09 15:51:48 +02:00
Rémi Verschelde 20d1a28341 squish: Update to upstream version 1.15 
Also fix clang-format pre-commit hook to ignore thirdparty files.

(cherry picked from commit fa2d5b91dc)
 2017-04-09 15:51:41 +02:00
Rémi Verschelde a27876d5ac Style: Apply clang-format (3.9.1) to Obj-C++ files 2017-04-09 14:03:52 +02:00
Rémi Verschelde a7a5ac596e Godot3 exporter: Convert engine.cfg properly 
Use a map to keep track of renamings as done for other properties.
The saving is a bit hackish, there might be simpler solutions.
 2017-04-09 02:11:36 +02:00
Rémi Verschelde fb4e9962ea Merge pull request #8326 from Hinsbart/particle_flip 
Particles2D: Fix flip property (again).
 2017-04-09 01:21:19 +02:00
Andreas Haas 9b6b713d61
Particles2D: Fix flip property (again). 
should have flipped the dst_rect..
 2017-04-09 01:16:48 +02:00
Rémi Verschelde c9eb0f5f45 Merge pull request #8317 from RandomShaper/fix-area-monitoring-2.1 
Fix side effects of the bookkepping of Area/Area2D's monitoring (2.1)
 2017-04-08 22:47:44 +02:00
Pedro J. Estébanez 86966940ff Allow a preprocess time of 0 for Particles2D 2017-04-08 20:00:24 +02:00
Rémi Verschelde 4b561e3e04 Merge pull request #8311 from BastiaanOlij/format_mm_2.1 
Spaces to tabs and layout adjustments on .mm files
 2017-04-08 16:49:51 +02:00
Rémi Verschelde f90eb87193 Revert "Make inline blocks in GDScript more pythonic" 
This reverts commit 0c650c2511.
Fixes #8315.
 2017-04-08 16:08:22 +02:00
Pedro J. Estébanez c3c0cfd207 Fix side effects of the bookkepping of Area/Area2D's monitoring 
- Fix monitoring flag being reset when the scene is out of the tree (happens on save all if the current scene is not the focused one, therefore on save-on-run as well)
- Fix the inability to reset the monitoring flag while the area is out of the tree
 2017-04-08 13:24:29 +02:00