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

18310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelly Thomas
a5e38586ce fix capitalization for antiquewhite 2018-12-23 08:00:35 +08:00
Rémi Verschelde
10e9221c49
Merge pull request #24546 from guilhermefelipecgs/fix_blend_tree 
Fix blend tree generating wrong node names
 2018-12-22 17:25:11 +01:00
Guilherme Felipe
8a202bc223 Fix blend tree generating wrong node names 
Now it's possible to connect nodes again.
 2018-12-22 12:18:04 -02:00
Rémi Verschelde
404f394226
Merge pull request #24536 from nekomatata/android-gles3 
GLES3 Fragment shader error fix for Android
 2018-12-21 22:25:03 +01:00
PouleyKetchoupp
ab7759dbd1 Fixed fragment shader compilation error on android (S0001: Cannot compare 'float' with 'int') 2018-12-21 20:31:10 +01:00
Rémi Verschelde
a0d8bfb0d2
Merge pull request #24529 from akien-mga/opengl-2.1-lowp 
GLES2: Define 'lowp' for OpenGL 2.1
 2018-12-21 15:56:05 +01:00
Rémi Verschelde
0d3c6fae35
Merge pull request #22775 from KellyThomas/named-colors 
[Mono] Color - add ColorN() and named color properties
 2018-12-21 15:51:46 +01:00
Rémi Verschelde
57416bfbce GLES2: Define 'lowp' for OpenGL 2.1 
Precision qualifiers are only used on OpenGL ES 2.0 and 3.0,
and while OpenGL 3.3 defines them for compatibility (but without
practical effect), they're missing from OpenGL 2.1, so we define
them to prevent compilation errors.

Fixes #24521.
 2018-12-21 15:14:58 +01:00
Rémi Verschelde
762b9b6bdb
Merge pull request #24527 from akien-mga/pm-warn-config-version 
ProjectManager: Warn when projects have different config_version
 2018-12-21 14:43:51 +01:00
Juan Linietsky
7b1cbe9874 Reverse RGBA shadow test on GLES2 2018-12-21 10:02:43 -03:00
Juan Linietsky
7535c5a56a Further GLES2 fixes 2018-12-21 10:01:16 -03:00
Juan Linietsky
9ea27ec032 Fixes to framebuffer formats for GLES2, closes #24518 2018-12-21 09:50:57 -03:00
Rémi Verschelde
616beb1041 ProjectManager: Warn when projects have different config_version 
When opening projects for edition through the project manager, the
following checks are now done:

1. If the config_version is lower than the one used by the current
   engine version, users are asked if they want to convert to the new
   format or abort editing. Fixes #20626.
2. If the config_version is higher than the expected one (project
   from a more recent and incompatible engine version), projects are
   grayed out and can't be edited. Fixes #18758.

When editing from the command line, the behaviour is unchanged:
projects in situation (1) are automatically converted, while projects
in situation (2) show an error message (made more explicit).

The "Run" option from the project manager was not changed, so it will
still run (1) projects without converting them, and fail running (2)
projects.

Co-authored-by: groud <gilles.roudiere@gmail.com>
 2018-12-21 12:45:27 +01:00
Rémi Verschelde
be8c0d57c5
Merge pull request #24519 from Chaosus/error_label_fix 
Change LinkLabel back to Label in error status bar
 2018-12-21 10:14:04 +01:00
Rémi Verschelde
beccbe1efb
Merge pull request #24516 from YeldhamDev/scons_gui_3d 
Fix possible error in "disable_advanced_gui" flag's description
 2018-12-21 10:10:46 +01:00
Rémi Verschelde
f09956c86c
Merge pull request #24513 from YeldhamDev/fix_tileset_editor_draw 
Fix small drawing error in TileSet editor
 2018-12-21 10:09:00 +01:00
Rémi Verschelde
0b774d47e6
Merge pull request #24509 from guilhermefelipecgs/fix_24273 
Add bind for TileMap::get_cell_autotile_coord
 2018-12-21 10:08:03 +01:00
Rémi Verschelde
83c3cba640
Merge pull request #24508 from guilhermefelipecgs/fix_22756 
Fixes for TileSetEditor and TileMapEditor
 2018-12-21 10:05:53 +01:00
Chaosus
260b5818f1 Change LinkLabel back to Label in error status bar 2018-12-21 11:39:54 +03:00
Kelly Thomas
09496d93b1 [Mono] Color - add ColorN(), Colors - add named color properties 2018-12-21 15:01:32 +08:00
Michael Alexsander Silva Dias
48935816dd Fix possible error in "disable_advanced_gui" flag's description 2018-12-21 00:21:10 -02:00
Michael Alexsander Silva Dias
daf54133c2 Fix small drawing error in TileSet editor 2018-12-20 19:52:56 -02:00
Juan Linietsky
f3cb236f9d Remove usage of VAO, which does not work in GLES2 2018-12-20 17:28:01 -03:00
Rémi Verschelde
25b98e4842
Merge pull request #24502 from Shinryuuji/fix-texturelayered-format 
Fix TextureLayered::create not retaining format
 2018-12-20 19:13:23 +01:00
Rémi Verschelde
123710123d
Merge pull request #24503 from akien-mga/certs-update-f29 
certs: Sync with latest ca-certificates-2018.2.26-2.fc29
 2018-12-20 19:13:11 +01:00
Rémi Verschelde
2709113c83
Merge pull request #24499 from akien-mga/android-thirdparty 
Android: Better identify thirdparty C/C++ code
 2018-12-20 19:12:58 +01:00
Guilherme Felipe
9eb4bb044f Add bind for TileMap::get_cell_autotile_coord 2018-12-20 15:43:44 -02:00
Guilherme Felipe
21bad78bd8 Fixes for TileSetEditor and TileMapEditor 
[TileSetEditor] Hide Bitmask and Priority for ATLAS_TILE
[TileMapEditor] Hide "Disable autotile" if the selected tile isn't
autotile
Fix #22756, don't update bitmask when tilemode is ATLAS_TILE
 2018-12-20 15:31:45 -02:00
Juan Linietsky
3bdd1ff387 Support lights and shadows in GLES2, fixes #21853 2018-12-20 10:10:30 -03:00
Rémi Verschelde
6cdcde7114 doc: Add missing commas after "If true/false" 2018-12-20 13:47:12 +01:00
Rémi Verschelde
6770357e47 Android: Better identify thirdparty C/C++ code 
- The `cpu-features.{c,h}` code was only used by chance by the webm
  (libvpx) code, so I moved it there. It was actually introduced before
  that and wasn't in use, and libvpx just happened to be able to
  compile thanks to it being bundled.
  It could potentially be compiled on the fly from the Android NDK, but
  since we plan to replace the webm module by a GDNative plugin in the
  near future, I went the bundling route.

- `ifaddrs_android.h` is already provided in the Android NDK as
  `ifaddrs.h`, same as on other Unixes. Yet we cannot use it until we
  up the min API level to 24, where `getifaddrs` is first defined.
  I moved the files to `thirdparty/misc` and synced them with upstream
  WebRTC (only indentation changes and removal of `static` qualifiers).

Also removes dropped thirdparty files from COPYRIGHT.txt after changes
in #24105 and #24145.
 2018-12-20 13:07:54 +01:00
Rémi Verschelde
e50407d2d2 certs: Sync with latest ca-certificates-2018.2.26-2.fc29 2018-12-20 13:04:39 +01:00
Shinryuuji
e24379e61f Fix TextureLayered::create not retaining format 2018-12-20 12:35:22 +01:00
Rémi Verschelde
d8067e905c
Merge pull request #24500 from akien-mga/drop-global_defaults 
Core: Drop unused global_defaults logic
 2018-12-20 11:49:32 +01:00
Rémi Verschelde
a8faa55042
Merge pull request #24485 from volzhs/system-time-ms 
Added OS.get_system_time_msecs()
 2018-12-20 11:31:16 +01:00
Rémi Verschelde
9cb18232c2 Core: Drop unused global_defaults logic 
It used to be used for Android and iOS to specify platform-specific
project settings overrides, but we now have feature tags for that.
 2018-12-20 11:02:49 +01:00
volzhs
84d060c768 Added OS.get_system_time_msecs() 2018-12-20 18:50:50 +09:00
Rémi Verschelde
b3f6e54cc6 Style: Fix formatting in GLES2 shaders 2018-12-20 10:33:48 +01:00
Rémi Verschelde
1a2fc40f86
Merge pull request #24495 from vipsbpig/pr-fix-gles2-spotlight 
Fix GLES2 Spotlight shadow problem
 2018-12-20 10:08:23 +01:00
Rémi Verschelde
45f1cdb0b7
Merge pull request #24481 from vnen/android-export-debug-keystore 
Add option to add debug keystore in Android export
 2018-12-20 09:42:34 +01:00
Gitea
9f48094982 fix gles2 spotlight problem 2018-12-20 15:01:59 +08:00
Rémi Verschelde
e8cdbf99e9 CodeEditor: Drop unused enable_complete_timer variable 
Its use was removed in 1039ba9ffb.
 2018-12-19 20:31:55 +01:00
George Marques
e3e5a1bb6e Add option to add debug keystore in Android export 2018-12-19 15:09:09 -02:00
Juan Linietsky
aa819a8538 Properly support light shaders in GLES2, fixes #21651 2018-12-19 10:25:45 -03:00
Rémi Verschelde
a06f8ca6b9
Merge pull request #24439 from staalduinen/mouse-motion-fix 
fix near infinite loop when no previous mouse position
 2018-12-19 14:09:24 +01:00
Arjen van Staalduinen
ef9313f415 fix near infinite loop when no previous mouse position 
Added physics_has_last_mousepos to better deal with
situations where there is no last_mousepos
 2018-12-19 13:35:41 +01:00
Rémi Verschelde
26058376aa
Merge pull request #24462 from guilhermefelipecgs/fix_copy_paste_tilemap 
Fix copy/paste for TileMap
 2018-12-19 08:43:52 +01:00
Guilherme Felipe
06a929ace7 Fix copy/paste for TileMap 
Fix #24440
 2018-12-18 22:48:59 -02:00
Rémi Verschelde
c6edc435f4
Merge pull request #24457 from volzhs/colored-font-size 
Fix colored font rendered in wrong size
 2018-12-19 00:15:03 +01:00
Juan Linietsky
bec76cfa19 Change how rects are drawn (and also will help batching eventually), to workaround problem in #9913 2018-12-18 17:50:35 -03:00