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

2736 Commits

Author SHA1 Message Date
Rémi Verschelde f67c78d9cd
Merge pull request #28413 from akien-mga/xatlas-cleanup-thekla 
SCons: Clean xatlas SCsub from thekla/poshlib defines
 2019-04-25 13:53:29 +02:00
Rémi Verschelde 1cd8dda461
Merge pull request #28267 from Xrayez/fix-bmp-indexed-8-4-1 
Load and import 4/1-bit BMP images
 2019-04-25 13:43:14 +02:00
Max Hilbrunner 80ad49748e
Merge pull request #28265 from Xrayez/fix-tga-indexed-palette 
Fix TGA indexed images loaded with flipped color table
 2019-04-25 13:39:07 +02:00
Rémi Verschelde eb155bc91a SCons: Clean xatlas SCsub from thekla/poshlib defines 
Those are not used in xatlas.
 2019-04-25 12:27:10 +02:00
Rémi Verschelde 24005bc03d
Merge pull request #28396 from akien-mga/scons-capture-the-flags 
SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS
 2019-04-25 12:22:22 +02:00
Ignacio Etcheverry d93c354807 Fix invalid mono log file name on Windows 2019-04-24 18:52:03 +02:00
Rémi Verschelde c2a669a9f0 SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS 
Many contributors (me included) did not fully understand what CCFLAGS,
CXXFLAGS and CPPFLAGS refer to exactly, and were thus not using them
in the way they are intended to be.

As per the SCons manual: https://www.scons.org/doc/HTML/scons-user/apa.html

- CCFLAGS: General options that are passed to the C and C++ compilers.
- CFLAGS: General options that are passed to the C compiler (C only;
  not C++).
- CXXFLAGS: General options that are passed to the C++ compiler. By
  default, this includes the value of $CCFLAGS, so that setting
  $CCFLAGS affects both C and C++ compilation.
- CPPFLAGS: User-specified C preprocessor options. These will be
  included in any command that uses the C preprocessor, including not
  just compilation of C and C++ source files [...], but also [...]
  Fortran [...] and [...] assembly language source file[s].

TL;DR: Compiler options go to CCFLAGS, unless they must be restricted
to either C (CFLAGS) or C++ (CXXFLAGS). Preprocessor defines go to
CPPFLAGS.
 2019-04-24 16:57:58 +02:00
Juan Linietsky 325f6c6581 Added inspector plugin documentation. 
Fixed plugin bindings.
 2019-04-23 16:39:09 -03:00
Andrii Doroshenko (Xrayez) 6484da5721 Import 4/1 bit bmp images 
Add some sanity checks according to bmp specification.

Read color table and index data within the same scope and
then simply extend the color palette.

This particular implementation has one limitation: not all 4/1 bit images
can be imported as it requires bit unpacking (size dimensions must be
a multiple of 8 for 1-bit and 2 (even) for 4-bit images).
 2019-04-23 17:02:13 +03:00
Rémi Verschelde 458827efc2
Revert "Implemented terrain raycast acceleration" 2019-04-23 13:56:23 +02:00
Hein-Pieter van Braam fc2e2dfa43
Merge pull request #24547 from Shinryuuji/master 
Add support for 8bpp bmp files
 2019-04-23 06:35:25 +03:00
Hein-Pieter van Braam a033c686f9
Merge pull request #25004 from Faless/enet/proto_optimize 
Save 4 bytes in ENet multiplayer protocol.
 2019-04-23 06:29:11 +03:00
Hein-Pieter van Braam 4575769115
Merge pull request #25543 from Zylann/optimize_bullet_heightfield_raycast2 
Implemented terrain raycast acceleration
 2019-04-23 06:25:15 +03:00
Hein-Pieter van Braam 7ba772d4ba
Merge pull request #27730 from ShyRed/fix3dphyscansleep 
Fix missing re-activation of bullet physics sleep feature
 2019-04-23 06:03:27 +03:00
Rémi Verschelde a342131eba
Merge pull request #27673 from qarmin/small_fixes 
Small fixes, mostly duplicated code
 2019-04-22 12:00:34 +02:00
Rémi Verschelde ab4705a807
Merge pull request #28125 from KoBeWi/code_true_code 
Consistently wrap booleans in [code]
 2019-04-22 11:59:16 +02:00
Rémi Verschelde 2f73e2282c
Merge pull request #28132 from fire/dont_touch_normals 
Assimp: Don't touch normals.
 2019-04-22 11:58:46 +02:00
Rémi Verschelde 429fc5b62c
Merge pull request #28162 from Jummit/vs-new-nodes-at-cursor 
Position nodes added from the generic search to the position the cursor was when opening the search
 2019-04-22 11:54:27 +02:00
Rémi Verschelde 3610b4fd77
Merge pull request #28179 from neikeq/welp 
Use StringBuilder in C# bindings generator
 2019-04-22 11:52:30 +02:00
Andrii Doroshenko (Xrayez) d0f0f1f1cb Fix TGA indexed images loaded with flipped color table 
This fixes incorrect color table lookup where red and blue channels were flipped.
 2019-04-21 16:05:00 +03:00
Rémi Verschelde 7d0275785b
Merge pull request #27940 from LeonardMeagher2/fix_csgshape_geometryinstance 
CSGMesh gets material + CSGShape inherits from GeometryInstance
 2019-04-21 13:07:29 +02:00
Rémi Verschelde 5899972049
Merge pull request #27554 from volzhs/freetype-2.10.0 
Update freetype to 2.10.0
 2019-04-20 20:00:56 +02:00
Ignacio Roldán Etcheverry 7be498499b
Merge pull request #27820 from ForLoveOfCats/master 
Mono: Convert all items to string before printing
 2019-04-20 04:12:22 +02:00
ForLoveOfCats 25f563c4c8 Mono: Convert all items to string before printing 2019-04-19 12:59:22 -04:00
Rémi Verschelde 8269ed9cdf
Merge pull request #28196 from akien-mga/xatlas-cleanup 
xatlas: Document provenance, copyright and custom changes
 2019-04-19 12:59:41 +02:00
Rémi Verschelde 7b1d75223a
Merge pull request #28193 from akien-mga/drop-thekla 
Drop unused thekla_atlas dependency
 2019-04-19 12:51:13 +02:00
Rémi Verschelde b29df348e2
Merge pull request #28192 from akien-mga/doc-unused-demos 
doc: Drop unused <demos> tag, sync classref
 2019-04-19 12:50:42 +02:00
Rémi Verschelde 1e39fee140 xatlas: Revert to unmodified upstream code, add to COPYRIGHT 
Imported by @reduz from b8ec29b6b6
Custom changes will be remade properly in the next commit.
 2019-04-19 12:39:26 +02:00
Rémi Verschelde 6640f397f1 Drop unused thekla_atlas dependency 
Since f12cb82 @reduz dropped the use of the thirdparty thekla_atlas
library, which is replaced by xatlas.

Fixes #28180.
Fixes #28182.
 2019-04-19 11:42:58 +02:00
Rémi Verschelde 268b520703 doc: Sync classref with current source 2019-04-19 11:21:09 +02:00
Rémi Verschelde 6af69f851a doc: Drop unused <demos> tag 2019-04-19 11:03:46 +02:00
Ignacio Etcheverry f64aa02933 Use StringBuilder in C# bindings generator 
- Also fixed generation of empty summary comments when no comment should have been generated.
 2019-04-19 02:11:39 +02:00
Ignacio Roldán Etcheverry 392f1491e1
Merge pull request #28161 from neikeq/exception-hook-no-abort 
Mono: Use exit(status) instead of abort() in exception hook
 2019-04-18 16:26:54 +02:00
Jummit a68b733e17 position nodes from the generic search at the cursor 2019-04-18 15:30:20 +02:00
Ignacio Etcheverry 8759c0e31a Mono: Use exit(status) instead of abort() in exception hook 2019-04-18 15:01:50 +02:00
Ignacio Etcheverry 2b9557c920 C#: Add missing ToString() override methods 
Godot.Object, Array, Dictionary and RID were missing ToString() override methods
 2019-04-18 14:48:13 +02:00
Ignacio Roldán Etcheverry d1f98ff51b
Merge pull request #28139 from neikeq/mono-log-level-info 
Mono: Logging improvements
 2019-04-18 13:14:02 +02:00
Ignacio Etcheverry 20e5e2fec7 Mono: Logging improvements 
- The default log level in debug builds is now 'info' instead of 'debug'.
- Add option to specify a different log level with the 'GODOT_MONO_LOG_LEVEL' environment variable.
- The name of log files is now a readable date and time.
- Always print the log file path (previously it was printed only it in verbose mode).
 2019-04-17 23:03:32 +02:00
K. S. Ernest (iFire) Lee aa39a78778 Assimp: Don't touch normals. 2019-04-17 10:48:54 -07:00
Tomasz Chabora b0846f60c9 Consistently wrap booleans in [code] 2019-04-17 17:13:00 +02:00
Rémi Verschelde cac650022f
Merge pull request #28053 from lupoDharkael/shadowing 
GDScript: add variable shadowing warning
 2019-04-16 09:25:36 +02:00
Rémi Verschelde 06e580f5ba
Merge pull request #26792 from Faless/webrtc_pr 
Initial WebRTC support
 2019-04-15 19:57:06 +02:00
lupoDharkael 14078fbb82 GDScript: add variable shadowing warning 2019-04-15 18:19:14 +02:00
Rémi Verschelde 09e94aa087 doc: Sync classref with current source 2019-04-15 14:49:41 +02:00
Juan Linietsky ad1368a625 Clean up ASSIMP import code. 2019-04-13 15:19:47 -03:00
Fabio Alessandrelli 66a5166870 Register WebRTCPeerJS and WebRTCPeerGDNative 2019-04-12 18:51:48 +02:00
Fabio Alessandrelli 320960cd32 Add WebRTC GDNative interface 2019-04-12 18:51:24 +02:00
Fabio Alessandrelli 7c17e31a55 Add WebRTC JS implementation 2019-04-12 18:51:24 +02:00
Fabio Alessandrelli c51958689c Implement WebRTCPeer custom instance class 2019-04-12 18:51:17 +02:00
Ignacio Roldán Etcheverry b7cf4c2050
Merge pull request #27950 from Nonnu42/contrib 
Fixes #17233 allowing C# to override _GetPropertyList
 2019-04-12 16:43:27 +02:00