3fe740dac6
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-21 10:26:04 -03:00
49a19f85b8
-different attempt to avod deadlock problem
2015-12-21 10:25:46 -03:00
d4ed043968
too early to rename thread
2015-12-21 09:38:44 -03:00
0576e1e28f
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-21 09:17:15 -03:00
72a6b137ba
audio threads
2015-12-21 09:01:40 -03:00
5e0f43d051
naming the audio thread from within itself
2015-12-18 03:41:44 -03:00
10298b9534
thread set name
2015-12-17 06:24:27 -03:00
f2183a5e09
replaced :var by :Variant in documentation, fixes #2897
2015-12-14 08:28:01 -03:00
89efebbf56
New and corrected are override modes.
2015-12-14 02:56:49 +01:00
428984ec0c
-New mask mode for lights, makes using masks MUCH easier.
2015-12-08 20:25:08 -03:00
38ab47d2f9
Merge pull request #2865 from hurikhan/pr_fix_2791
...
Added additional token checks for the shader if..else.. statement.
2015-12-08 17:09:58 -03:00
ff936c6b2e
Merge pull request #2868 from akien-mga/pr-fix-can-move-to
...
Fix can_move_to and rename it for more clarity
2015-12-08 17:09:47 -03:00
43b2c9c7a4
Areas now calculate their dampenings the same way as their gravity.
2015-12-08 18:45:14 +01:00
9457211f8f
Fix wrong index being used to populate r_results
...
Regression from f33d9da
2015-12-04 09:31:01 +01:00
4b1f0afb01
-several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device.
2015-12-02 11:15:48 -03:00
1231c795de
Fix Body (and Body2D) add_area / remove_area when area have multiple shapes
2015-12-02 11:30:48 +01:00
67a1c3f136
Bug Fix #2541 : Shader language function validation logic
...
ensures that it finds the correct function to validate.
2015-11-27 21:27:06 +08:00
aa30e01f26
Merge pull request #2752 from SaracenOne/shadow_color
...
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
2674565cf6
Merge pull request #1931 from Faless/audio_free_rid
...
Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
2015-11-23 00:22:15 +01:00
f33d9dab5b
Fix can_move_to and rename it for more clarity
...
Fixes #2416 .
The KinematicBody::can_move_to function was likely designed for two behaviours:
- discrete: check if the body can "teleport" to the destination
- continuous: check if the direct path to the destination is valid
The continuous behaviour was however not implemented, and the discrete behaviour was broken too due to a wrong call to intersect_shape.
The discrete behaviour has thus been fixed and the function renamed to can_teleport_to for more clarity.
2015-11-22 14:14:07 +01:00
49f4ec2b71
Added additional token checks for the shader if..else.. statement. Fixes issue #2791 .
2015-11-22 13:49:58 +08:00
d3eb9e8c54
-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260
2015-11-19 10:41:20 -03:00
dd00452997
Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
...
Conflicts:
drivers/gles2/shader_compiler_gles2.cpp
2015-11-18 23:18:10 +00:00
0c3386b2ed
Merge pull request #2707 from akien-mga/master
...
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
f0aeb036d1
Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement
...
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18 19:36:47 -03:00
e82afd9c50
Merge pull request #2629 from firefly2442/float-to-bool
...
float to bool variable type, fixes : #2478
2015-11-18 19:17:29 -03:00
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
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
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
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
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
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
281d6fac1e
-some fixes to audio
2015-11-01 01:55:22 -03:00
b59c86f6f9
-Ability to debug video memory usage
...
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
bb68dc5210
remove child variable that is duplicated from parent class
2015-10-18 21:45:27 -05:00
4621d30d1b
float to bool variable type, fixes : #2478
2015-10-18 19:49:30 -05:00
63033aa646
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-17 10:30:08 -03:00
ab22203791
misc cleanup
2015-10-17 10:29:54 -03:00
b217e1417a
Merge pull request #2479 from firefly2442/cppcheck-unusedvars
...
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
652a01f16f
Merge pull request #2572 from leezh/clipping-fix
...
nested clipping of canvas items now works
2015-10-17 09:48:38 -03:00
a871fc9112
Merge pull request #2587 from eska014/fix-area2d-mask-matching
...
Fix Area/Area2D mask matching
2015-10-17 09:47:27 -03:00
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
b3cda43a0f
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
platform/windows/detect.py
2015-10-13 01:19:32 -03:00
2ffc90d8b4
Expose softness parameter of pin joint to the editor.
2015-10-10 23:28:05 +03:00
375a7a727f
Fix 3D Area mask matching
2015-10-10 02:33:26 +02:00
13ff4bde65
Fix Area2D type mask matching
2015-10-09 21:54:16 +02:00
aad2bbdb6f
newline fixes
2015-10-08 15:00:40 -03:00
3514a87b37
fixed uninitialized memory issues in audio code
2015-10-08 14:50:18 -03:00
7f001a2c76
nested clipping of canvas items now works
2015-10-05 11:50:16 +01:00
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
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
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
afbb6c064c
ran cppcheck, found unused variables
2015-09-16 15:35:30 -05:00
e5730c1c7c
fixed server breaking error in previous splash screen commit
2015-09-12 19:15:02 -07:00
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
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
b0aa49accb
merged some stuff for okam
2015-09-03 23:24:55 -03:00
2d8866574d
Added gravity scale, and linear/angular damp override to 3D physics.
2015-08-30 18:57:17 -03:00
4613a3f2c0
small fixes
2015-06-30 11:59:00 -03:00
85e49d4e75
added support for mirrored repeat texture wrapping
2015-06-25 14:51:21 -07:00
52308aba68
ability to change shadow color in light2d
2015-06-24 18:15:43 -03:00
74081cdaaa
Merge pull request #2090 from volzhs/pmr_virtual
...
fix register Physics2DTestMotionResult not virtual
2015-06-22 23:54:24 -03:00
839d69502c
fix register Physics2DTestMotionResult
2015-06-15 08:57:14 +09:00
89300b70e7
added ability for Area (3D) to detect other areas
2015-06-12 15:52:21 -03:00
9e479065f5
new space shooter demo
...
ortho camera sort fix, closes #2063
2015-06-11 10:00:48 -03:00
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
b524b40fdc
-fixed many memory initialization issues
...
-fixed deadlock on previews thread
-fixed compilation errors on unix
2015-06-06 22:06:58 -03:00
f62961aba3
-fix bug in animation editor
...
-fix crash bug in physics motion, closes #1993
2015-05-27 17:30:50 -03:00
b1b7826ea7
oops, previous commit was not working
...
it is working now
2015-05-26 01:30:36 -03:00
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
1e50677594
fixes on sample importing
2015-05-19 23:37:04 -03:00
e323cc0505
-Rename unexisting by nonexistant, closes #1940
...
-Added function to retrieve list of actions fron InputMap
2015-05-18 10:20:54 -03:00
590afbcac4
Calculate gravity based on distance from body to gravity point (2D)
2015-05-18 01:32:26 +00:00
473c7222f5
Calculate gravity based on distance from body to gravity point
2015-05-18 01:30:43 +00:00
bbe9a37f1d
sleeping property now should work properly, fixes #1892
2015-05-16 17:54:36 -03:00
32b1b472af
-improved one-way collision handling in both dynamic and character bodies for 2D, fixes #1854
2015-05-10 19:24:09 -03:00
897a1aade5
optional formal changes
2015-05-06 01:22:31 +02:00
670d77813f
PhysicsServerSW::body_is_shape_set_as_trigger - missing return statement
2015-05-06 00:41:41 +02:00
e7aa37fe75
improved kinematic motion, improved demos for kinematic motion
2015-05-03 22:37:10 -03:00
767f71a35e
-Made one way collision work with 2D physics (rigidbody)
2015-05-03 18:18:21 -03:00
af06843982
-new collision layer & mask system for 2D, for more flexible collision masking
2015-05-03 16:47:21 -03:00
4804462ee0
-Fixes from source code analyzizer, closes #1768
2015-05-01 10:44:08 -03:00
5c6b31c024
-fixed broken lighting in release version of godot for isometric light demo, fixes #1697
2015-04-30 11:34:24 -03:00
0adca0a7c9
-made normalmaps easier in 2D, fixes #1467
2015-04-27 08:11:54 -03:00
3bcb930e8a
properly wake up bodies when a parameter changes, fixes #1740
2015-04-26 16:20:00 -03:00
81f36b768d
fixes crash related to empty concavecollisionshape, fixes #1709
2015-04-26 13:03:01 -03:00
972af0b0cb
-Fixed shader commets, /* */ works well and crash is solved, fixes #1711
2015-04-26 12:34:42 -03:00
ec00cd5c41
-Resolved light clipping issue due to wrong global rect cache, fixes #1722
2015-04-25 10:32:34 -03:00
f971ae32e1
casting line into physics on negative space now works properly, fixes #1726
2015-04-24 22:41:31 -03:00
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
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
170a9349d2
Merge branch 'master' of https://github.com/okamstudio/godot
2015-04-18 16:18:59 -03:00
4661a6e126
-try to avoid errors when path using ".." is present in script include, fixes #1703
2015-04-18 16:17:33 -03:00
f92a1fd646
Merge pull request #1691 from Faless/area_combine_2d
...
Implement Area2D space_override_mode = COMBINE
2015-04-18 14:44:59 -03:00
fdaa2920eb
Updated copyright year in all headers
2015-04-18 14:38:54 -03:00
e1bfbcfd42
Fix operator definition for AreaCMP
2015-04-14 16:46:52 +00:00
bad445066c
Implement Area2D space_override_mode combine
2015-04-14 16:33:52 +00:00
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
d148a03848
-Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610
2015-04-09 00:29:21 -03:00
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
Ariel Manzur
Ariel Manzur
Ovnuniarchos
Rémi Verschelde
Fabio Alessandrelli
Andrea Chua
Rémi Verschelde
hurikhan
Saracen
firefly2442
Biliogadafr
eska
reduz
Zher Huei Lee
romulox_x
steve
volzhs
Juan Linietsky
ehriche