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

221 Commits

Author SHA1 Message Date
Juan Linietsky
e8435cc721 Merge pull request #2632 from firefly2442/duplicate-inherited-vars 
remove child variable that is duplicated from parent class
 2015-11-18 19:16:35 -03:00
Juan Linietsky
61c4c5795f -support for stereo ima-adpcm sample compression & playback 
-support for converting samples to ima-adpcm upon export
 2015-11-09 00:49:18 -03:00
Saracen
c1d19ad258 New shader feature: change the colour of shadows on a per-material basis. 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
 2015-11-08 03:54:55 +00:00
Fabio Alessandrelli
203f069329 Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid) 
to avoid script error due to collision with Object method free
 2015-11-02 17:54:33 +01:00
Saracen
b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem 
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
 2015-11-01 20:53:26 +01:00
Juan Linietsky
281d6fac1e -some fixes to audio 2015-11-01 01:55:22 -03:00
Juan Linietsky
b59c86f6f9 -Ability to debug video memory usage 
-Small fix to xml saver (swapping > and <)
 2015-10-21 09:50:44 -03:00
firefly2442
bb68dc5210 remove child variable that is duplicated from parent class 2015-10-18 21:45:27 -05:00
firefly2442
4621d30d1b float to bool variable type, fixes: #2478 2015-10-18 19:49:30 -05:00
Juan Linietsky
63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky
ab22203791 misc cleanup 2015-10-17 10:29:54 -03:00
Juan Linietsky
b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars 
ran cppcheck, found unused variables
 2015-10-17 10:25:36 -03:00
Juan Linietsky
652a01f16f Merge pull request #2572 from leezh/clipping-fix 
nested clipping of canvas items now works
 2015-10-17 09:48:38 -03:00
Juan Linietsky
a871fc9112 Merge pull request #2587 from eska014/fix-area2d-mask-matching 
Fix Area/Area2D mask matching
 2015-10-17 09:47:27 -03:00
Juan Linietsky
426909e26b Merge pull request #2594 from Biliogadafr/PinSoftness 
Expose softness parameter of pin joint to the editor.
 2015-10-17 09:45:16 -03:00
Juan Linietsky
b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/detect.py
 2015-10-13 01:19:32 -03:00
Biliogadafr
2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00
eska
375a7a727f Fix 3D Area mask matching 2015-10-10 02:33:26 +02:00
eska
13ff4bde65 Fix Area2D type mask matching 2015-10-09 21:54:16 +02:00
reduz
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
reduz
3514a87b37 fixed uninitialized memory issues in audio code 2015-10-08 14:50:18 -03:00
Zher Huei Lee
7f001a2c76 nested clipping of canvas items now works 2015-10-05 11:50:16 +01:00
Rémi Verschelde
092f84642c Rename voice_set_volume argument to p_volume to avoid confusion 
This argument is indeed expected to be a volume on a linear scale (not dB),
typically from 0.0 to 1.0, though it can go higher than 1.0.
 2015-09-26 22:43:34 +02:00
Juan Linietsky
c858515785 Fixed theora playback. Removed theoraplayer. 
Still need to get proper audio output latency in some platforms.
 2015-09-26 14:50:42 -03:00
Juan Linietsky
83d9a692be Ability to visually debug geometry visually: 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
 2015-09-20 13:03:46 -03:00
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
romulox_x
e5730c1c7c fixed server breaking error in previous splash screen commit 2015-09-12 19:15:02 -07:00
steve
b0e5031f1f ios now displays splash screen between launch image and main scene, instead of a black screen 2015-09-10 15:01:02 -07:00
Juan Linietsky
9741374617 Rewrite of the AudioStream API 
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
 2015-09-09 18:50:52 -03:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
2d8866574d Added gravity scale, and linear/angular damp override to 3D physics. 2015-08-30 18:57:17 -03:00
Juan Linietsky
4613a3f2c0 small fixes 2015-06-30 11:59:00 -03:00
romulox_x
85e49d4e75 added support for mirrored repeat texture wrapping 2015-06-25 14:51:21 -07:00
Juan Linietsky
52308aba68 ability to change shadow color in light2d 2015-06-24 18:15:43 -03:00
Juan Linietsky
74081cdaaa Merge pull request #2090 from volzhs/pmr_virtual 
fix register Physics2DTestMotionResult not virtual
 2015-06-22 23:54:24 -03:00
volzhs
839d69502c fix register Physics2DTestMotionResult 2015-06-15 08:57:14 +09:00
Juan Linietsky
89300b70e7 added ability for Area (3D) to detect other areas 2015-06-12 15:52:21 -03:00
Juan Linietsky
9e479065f5 new space shooter demo 
ortho camera sort fix, closes #2063
 2015-06-11 10:00:48 -03:00
Juan Linietsky
5064cc5006 Merge pull request #1932 from Faless/gravity_distance_full 
Calculate gravity based on distance from body to gravity point
 2015-06-07 00:25:37 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues 
-fixed deadlock on previews thread
-fixed compilation errors on unix
 2015-06-06 22:06:58 -03:00
Juan Linietsky
f62961aba3 -fix bug in animation editor 
-fix crash bug in physics motion, closes #1993
 2015-05-27 17:30:50 -03:00
Juan Linietsky
b1b7826ea7 oops, previous commit was not working 
it is working now
 2015-05-26 01:30:36 -03:00
Juan Linietsky
9df77d2765 ability to run 2D physics in a thread 
also, 2D physics is now thread safe too.
see physics_2d/thread_model
 2015-05-26 01:06:05 -03:00
Juan Linietsky
1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky
e323cc0505 -Rename unexisting by nonexistant, closes #1940 
-Added function to retrieve list of actions fron InputMap
 2015-05-18 10:20:54 -03:00
Fabio Alessandrelli
590afbcac4 Calculate gravity based on distance from body to gravity point (2D) 2015-05-18 01:32:26 +00:00
Fabio Alessandrelli
473c7222f5 Calculate gravity based on distance from body to gravity point 2015-05-18 01:30:43 +00:00
Juan Linietsky
bbe9a37f1d sleeping property now should work properly, fixes #1892 2015-05-16 17:54:36 -03:00
Juan Linietsky
32b1b472af -improved one-way collision handling in both dynamic and character bodies for 2D, fixes #1854 2015-05-10 19:24:09 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
ehriche
670d77813f PhysicsServerSW::body_is_shape_set_as_trigger - missing return statement 2015-05-06 00:41:41 +02:00
Juan Linietsky
e7aa37fe75 improved kinematic motion, improved demos for kinematic motion 2015-05-03 22:37:10 -03:00
Juan Linietsky
767f71a35e -Made one way collision work with 2D physics (rigidbody) 2015-05-03 18:18:21 -03:00
Juan Linietsky
af06843982 -new collision layer & mask system for 2D, for more flexible collision masking 2015-05-03 16:47:21 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
5c6b31c024 -fixed broken lighting in release version of godot for isometric light demo, fixes #1697 2015-04-30 11:34:24 -03:00
Juan Linietsky
0adca0a7c9 -made normalmaps easier in 2D, fixes #1467 2015-04-27 08:11:54 -03:00
Juan Linietsky
3bcb930e8a properly wake up bodies when a parameter changes, fixes #1740 2015-04-26 16:20:00 -03:00
Juan Linietsky
81f36b768d fixes crash related to empty concavecollisionshape, fixes #1709 2015-04-26 13:03:01 -03:00
Juan Linietsky
972af0b0cb -Fixed shader commets, /* */ works well and crash is solved, fixes #1711 2015-04-26 12:34:42 -03:00
Juan Linietsky
ec00cd5c41 -Resolved light clipping issue due to wrong global rect cache, fixes #1722 2015-04-25 10:32:34 -03:00
Juan Linietsky
f971ae32e1 casting line into physics on negative space now works properly, fixes #1726 2015-04-24 22:41:31 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean. 
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
 2015-04-20 19:38:02 -03:00
Juan Linietsky
28c4afeb57 -Rewritten KinematicBody2D::move to MUCH more efficient code. 
-KinematicBody2D::move now properly recognizes collision exceptions and masks, fixes #1649
-Removed object type masking for KinematicBody2D
-Added a test_motion() function to RigidBody2D, allowing simlar behavior to KinematicBody2D::move there.
 2015-04-19 20:50:55 -03:00
Juan Linietsky
170a9349d2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-18 16:18:59 -03:00
Juan Linietsky
4661a6e126 -try to avoid errors when path using ".." is present in script include, fixes #1703 2015-04-18 16:17:33 -03:00
Juan Linietsky
f92a1fd646 Merge pull request #1691 from Faless/area_combine_2d 
Implement Area2D space_override_mode = COMBINE
 2015-04-18 14:44:59 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Fabio Alessandrelli
e1bfbcfd42 Fix operator definition for AreaCMP 2015-04-14 16:46:52 +00:00
Fabio Alessandrelli
bad445066c Implement Area2D space_override_mode combine 2015-04-14 16:33:52 +00:00
Juan Linietsky
3e20391bf6 -Changed bootsplash option to use a file, fixes #1539 
-Added OS.get_splash_tick_msec() to query when splash appeared
 2015-04-12 17:55:01 -03:00
Juan Linietsky
d148a03848 -Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610 2015-04-09 00:29:21 -03:00
Juan Linietsky
219fce737c Merge pull request #1564 from Faless/area_combine-1 
Implement combine mode for area
 2015-04-07 20:21:11 -03:00
Juan Linietsky
9fa1698c74 Changes to Light 
-=-=-=-=-=-=-=-=

-Changed material unshaded property for an enum, which supports light-only shading
-Added a "Mix" shading mode, useful for using lights as masks
-Added energy parameter to Light2D
 2015-04-03 01:43:37 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1 
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
 2015-04-02 12:59:23 -03:00
Juan Linietsky
7fc4059b13 read depth fixes 2015-03-31 17:57:16 -03:00
Fabio Alessandrelli
600bae34bd Re-sort Area array during integration step 2015-03-24 18:46:26 +00:00
Fabio Alessandrelli
18a1403fcf Implement combine mode for area 2015-03-24 18:46:26 +00:00
Fabio Alessandrelli
4b3b5eba86 Use Vector for storing areas 2015-03-24 18:46:26 +00:00
Juan Linietsky
e9f94ce8d2 fix area center of gravity 2015-03-22 15:11:36 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal 
Changed code to remove gcc -Wparentheses warnings.
 2015-03-22 15:05:47 -03:00
Juan Linietsky
c2d975582c Merge pull request #1446 from UsernameIsAReservedWord/fixes_kinematicbody_move_crash 
should fixes #1284 (KinematicBody .move() crash)
 2015-03-22 14:56:30 -03:00
Juan Linietsky
dac2017dee fixes/cleans up 
-input now correctly works when using viewport scaling
-added function to get areas/bodies in given point
-added function to get space state directly from world
 2015-03-22 09:40:26 -03:00
Juan Linietsky
c6c72a3c37 input events on Area2D is now supported 
also added a demo showing how this works
 2015-03-22 01:46:18 -03:00
Juan Linietsky
acc6f3b285 signed distance field font support 2015-03-21 00:43:33 -03:00
Juan Linietsky
a969e2e6f1 Area2D can now detect overlap with other areas 
this should make everything simpler, specially for newcomers to Godot
 2015-03-17 00:45:25 -03:00
Juan Linietsky
53e1694e1e New option to send canvas to render buffer 
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
 2015-03-16 01:14:59 -03:00
Juan Linietsky
650e13f3cd back buffer copy node, to improve on texscreen() 
back buffer copy node and respective demo
 2015-03-12 01:05:50 -03:00
Juan Linietsky
a6f96f46b7 small optimizations to isometric light demo 
should work faster, and even faster if exported.. as textures have been
optimized.
 2015-03-10 21:05:49 -03:00
Juan Linietsky
91744e9ed3 New Demo, Screen Space Shaders 
-Fixes to screen space shaders.
-Fixes to isometric light demo.
 2015-03-10 00:53:50 -03:00
Juan Linietsky
09489e3a78 lot of work on 2D lighting and isometric maps 
added a new demo, isometric_light that does full isometric sorting,
lights, shadows, etc.
 2015-03-09 02:34:56 -03:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
 2015-03-03 14:41:36 -03:00
Juan Linietsky
4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky
a1f715a4da support for 2D shadow casters 
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
 2015-03-02 00:54:43 -03:00
UsernameIsAReservedWord
69cf996ce6 should fixes #1284 
I could reproduce the crash described in #1284 only with 32bits versions of godot.

The test scene contains a Plane collision shape, and a kinematicsbody with a Sphere collision shape.
 
The crash occurs into `CollisionSolverSW::solve_distance_plane()` on line 299 when `p_shape_A` is a `PlaneShapeSW` object and when `p_shape_B` is a `MotionShapeSW` object, because `int support_count;` is not initialized by default, and because `MotionShapeSW::get_supports()` does not change `support_count` once passed as referenced parameter, and if the default value of `support_count` is greater than the length of `supports[16]`.

I don't know if it is the good way to fix it because i'm not skilled ennough with the physics server inner working, but this fix prevents the crash and the test-scene seems to work correctly.
 2015-02-26 19:27:32 +01:00
romulox_x
2ac767b1f5 changed viewport clearing to use the alpha value of the clear color, and made the transparent bg option of viewport force a clear color of 0,0,0,0 2015-02-21 13:57:12 -08:00
Juan Linietsky
1d7337ba10 Merge pull request #1369 from not-surt/tile_rotation 
Tile Rotation
 2015-02-21 15:37:02 -03:00
romulox_x
f4312a5076 added option to disable automatic clearing of viewport render buffer 2015-02-21 01:35:06 -08:00
Juan Linietsky
3fdf3d8eab -fix compilation of godot server 2015-02-19 11:54:03 -03:00