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

16751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ignacio Etcheverry
d7ece43b74 Mono: Editor and export template dependencies and fixes 
- Bundle editor dependencies:
    - 'GodotSharp': Root data directory for the editor
        - 'Tools': Editor dependencies. Only GodotSharp.dll for now.
        - 'Api': Prebuilt GodotSharp and GodotSharpEditor API assemblies.
        - 'Mono': Mono files to bundle with the editor.
            - 'bin': (Optional, not used for now) Mono bin directory.
            - 'etc': Mono configuration files.
            - 'lib': Mono dependency shared libraries.
            - 'lib/mono/4.5': Framework assemblies.
    - Added build option to copy the required files from the mono installation to 'GodotSharp/Mono'. Enable with 'copy_mono_root=yes'. Disabled by default.

- Export template dependencies:
    - 'data_AppName'/'data_Godot':
        - 'Mono': Mono files to bundle with the game.
            - 'etc': Mono configuration files.
            - 'lib': Mono dependency shared libraries.
    - The data directory is generated when compiling and must be bundled with the export templates. In the case of OSX, the data directory must be placed inside the 'osx.zip' export template.
    - In OSX, alternative location for directories (needed for app bundles) are:
        - 'data_AppName/Mono/etc' --> '../Resources/GodotSharp/Mono/etc'
        - 'data_AppName/Mono/lib' --> '../Frameworks/GodotSharp/Mono/lib'

- The editor can bundle prebuilt API assemblies.
    - Generate them with a tools build by running: `--generate-cs-core-api <GodotSharp_OutputDir> --generate-cs-editor-api <GodotSharpEditor_OutputDir> <GodotSharp_OutputDir>/bin/Release/GodotSharp.dll` (This command will be simplified in the future and both projects will be in the same solution)
    - Build the solutions and copy the output files to '#bin/GodotSharp/Api'.
- Fixed API assembly being added twice during the export process.
 2018-10-03 19:16:29 +02:00
Ignacio Etcheverry
2e87703136
Merge pull request #22460 from neikeq/issue-22403 
Mono: Fix not creating generic Array or Dictionary where expected
 2018-09-27 00:38:39 +02:00
Ignacio Etcheverry
50fd5ef3b5 Mono: Fix not creating generic Array or Dictionary where expected 2018-09-27 00:11:31 +02:00
Ignacio Etcheverry
0f3de6ef3a Do not update cache if the C# API assembly is out of sync 2018-09-26 23:59:38 +02:00
Rémi Verschelde
a2b6be23ad ENet: Remove redundant if condition 
Closes #22445.
 2018-09-26 10:53:45 +02:00
Rémi Verschelde
d064b8e055
Merge pull request #22436 from Calinou/tweak-editor-texts 
Tweak some editor texts' capitalization, use "Go to" instead of "Goto"
 2018-09-26 08:38:08 +02:00
Hugo Locurcio
c4770a5b5d
Tweak some editor texts' capitalization, use "Go to" instead of "Goto" 
This also fixes a typo in the `debugger/debug_with_external_editor`
shortcut.
 2018-09-25 22:51:13 +02:00
Max Hilbrunner
8fc92ae86f
Merge pull request #22427 from Faless/multiplayer_errors 
Better MultiplayerAPI error messages.
 2018-09-25 21:39:14 +02:00
Fabio Alessandrelli
7e097cd00b Better MultiplayerAPI error logs. 2018-09-25 20:13:45 +02:00
Max Hilbrunner
efb730d950
Merge pull request #22425 from Faless/enet_service 
Set ENet service time to 0.
 2018-09-25 19:15:48 +02:00
Fabio Alessandrelli
f6e8579569 Skip RPC/RSET when MASTERSYNC and we are master. 2018-09-25 17:45:28 +02:00
Fabio Alessandrelli
977c9477c1 Set ENet service time to 0. 
Process all packets in queue, but never wait.
 2018-09-25 16:26:45 +02:00
Juan Linietsky
2005b0c820 Fix gizmo handles in GLES2 backend 2018-09-25 10:36:54 -03:00
Rémi Verschelde
23b2ca75c2
Merge pull request #22423 from Chaosus/fix_tooltip_border 
Fix incorrect tooltip border
 2018-09-25 15:16:57 +02:00
Rémi Verschelde
525b8fdab3
Merge pull request #22420 from PiOverFour/master 
Doc: fix example in Array sort_custom()
 2018-09-25 15:14:02 +02:00
Chaosus
7a3aaa69db Fix incorrect tooltip border 2018-09-25 14:18:25 +03:00
Damien Picard
5e8e216ee0 Doc: fix example in Array sort_custom() 2018-09-25 11:46:45 +02:00
Rémi Verschelde
5adf7aa6b7 SCons: Fix checks for clang in env['CXX'] 
They would match the whole path instead of only the filename.
 2018-09-25 11:15:25 +02:00
Rémi Verschelde
298a6ad73c
Merge pull request #22290 from groud/add_2dimensional_scale 
Add both X and Y scale in the scale editor
 2018-09-25 10:25:13 +02:00
groud
bad5ec61b1 Add both X and Y scale in the scale editor 2018-09-25 09:50:25 +02:00
Rémi Verschelde
cac3f44f6e
Merge pull request #22415 from ibrahn/fix-late-segfault-hang 
Fixed hang when segfaulting after OS object destroyed (OSX and X11)
 2018-09-25 08:33:28 +02:00
Ibrahn Sahir
653b832422 Fixed hang when segfaulting after OS object destroyed (OSX and X11) 
The two POSIX style crash handlers (OSX and X11) now remove their signal
handlers when they are destroyed.
Additonally if they are called while no OS singleton is set, they will
simply abort(). This should not happen now that they remove themselves,
but if a future change seperates OS object and crash handler lifetimes,
this may be easier to report/debug than hanging on SIGSEGV.
 2018-09-24 22:21:05 +01:00
Rémi Verschelde
c432ce4ee1
Merge pull request #22400 from Chaosus/viewport_color 
Added viewport border color setting for canvas item editor
 2018-09-24 15:48:55 +02:00
Rémi Verschelde
1f18a85ea1
Merge pull request #22398 from groud/fix_import_tab_update 
Fix import tab not updating when selecting in the tree view
 2018-09-24 15:26:23 +02:00
Chaosus
943d0a90f5 Added viewport border color setting for canvas item editor 2018-09-24 16:16:40 +03:00
Rémi Verschelde
49665a46d8
Merge pull request #22353 from YeldhamDev/bbcode_strikethrough 
Add proper strikethrough BBCode to RichTextLabel
 2018-09-24 14:34:54 +02:00
Rémi Verschelde
394e5de6bb
Merge pull request #22396 from groud/allow_higher_treeview 
Allow the tree view of FileSystem to take more space
 2018-09-24 14:32:40 +02:00
groud
ed516a11ca Fix import tab not updating when selecting in the tree view 2018-09-24 14:26:26 +02:00
groud
43beed489a Allow the tree view of FileSystem to take more space 2018-09-24 12:01:20 +02:00
Max Hilbrunner
aaef640b8c
Merge pull request #22383 from Faless/ws_close 
Implement WebSocket close frame handling
 2018-09-24 06:29:30 +02:00
Fabio Alessandrelli
df43b94e6e Update WebSocket documentation 2018-09-24 01:50:37 +02:00
Fabio Alessandrelli
4b92956db7 Implement WebSocket clean close detection. 2018-09-24 01:50:37 +02:00
Fabio Alessandrelli
5d91e87c64 Implement WebSocket close notify. 2018-09-24 01:50:37 +02:00
Michael Alexsander Silva Dias
d959e2ce78 Add proper strikethrough BBCode to RichTextLabel 2018-09-23 16:25:43 -03:00
Rémi Verschelde
399910ddd8
Merge pull request #22357 from DualMatrix/no_built_in 
Prevent built-in-scripts from being made from FileSystem dock
 2018-09-23 18:37:45 +02:00
Rémi Verschelde
60312915dc Fix build after 65fd37c1, using Math_PI 
Also fix style in shaders.
 2018-09-23 18:26:57 +02:00
Rémi Verschelde
75e44badba
Merge pull request #22380 from allkhor/fix_scons_warning 
Fixed scons warning: Ignoring missing 'core/helper/SCsub' after  #22351.
 2018-09-23 18:18:57 +02:00
allkhor
79d6bde5ac Fixed scons warning: Ignoring missing 'core/helper/SCsub' after #22351. 2018-09-23 21:45:35 +06:00
DualMatrix
6dc0120c60 Prevent built-in-scripts from being made from FileSystem dock 
Prevent built-in-scripts from being made from FileSystem dock
 2018-09-23 17:38:59 +02:00
Juan Linietsky
65fd37c149 -Rewrote GLES2 lighting and shadows and optimized state changes, did many optimizations, added vertex lighting. 
-Did some fixes to GLES3 too
 2018-09-23 12:14:50 -03:00
Rémi Verschelde
7e3ce79ea9
Merge pull request #22346 from Paulb23/text_file_icon 
Icon for TextFiles.
 2018-09-23 17:10:57 +02:00
Rémi Verschelde
2c7908739a
Merge pull request #22351 from DualMatrix/remove_obsolete 
Removed obsoleted core/helper/value_evaluator.h and moved math_fieldwise to core/math/
 2018-09-23 15:27:20 +02:00
DualMatrix
f483460e38 Removed obsoleted core/helper/value_evaluator.h and moved math_fieldwise to core/math/ 
Removed obsoleted core/helper/value_evaluator.h and moved math_fieldwise to core/math/
 2018-09-23 14:58:15 +02:00
Rémi Verschelde
3b51022429
Merge pull request #22372 from akien-mga/cull-margin-range 
Fix GeometryInstance extra_cull_margin step
 2018-09-23 14:38:40 +02:00
Rémi Verschelde
68b1ac2d12
Merge pull request #22371 from akien-mga/locale-C 
Fallback to "en" when invalid locale is requested
 2018-09-23 14:38:25 +02:00
Rémi Verschelde
d4c75e608e Fix GeometryInstance extra_cull_margin step 
Fixes #22369.
 2018-09-23 13:58:58 +02:00
Rémi Verschelde
87535fe291 Fallback to "en" when invalid locale is requested 
Close #22365.
 2018-09-23 13:58:01 +02:00
Rémi Verschelde
8b2eeaa724
Merge pull request #22362 from homer666/physicsdirectspacestate-docs-update 
[DOCS] PhysicsDirectSpaceState updates
 2018-09-23 12:32:44 +02:00
Rémi Verschelde
81d713e5c2
Merge pull request #22342 from DualMatrix/duplicate_no_fun 
Fixed duplicating nodes not attaching script in-game with Sync Scene Changes enabled
 2018-09-23 11:57:03 +02:00
homer666
194f476095 [DOCS] PhysicsDirectSpaceState updates 2018-09-23 09:31:37 +10:00