Commit graph

220 commits

Author SHA1 Message Date
Juan Linietsky
db43b9bcf0 Merge pull request #2080 from bojidar-bg/patch-1
Fix to #2079
2015-06-22 23:56:38 -03:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE*
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
2015-06-22 00:04:15 -03:00
Bojidar Marinov
852bf95c0c Delete .fscache from fog_of_war demo, closes #2079. 2015-06-13 14:47:22 +03:00
Bojidar Marinov
5a0de04eb7 Resolved a merge conflict. 2015-06-13 14:43:12 +03:00
Juan Linietsky
c845c2a827 added icon 2015-06-11 10:03:33 -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
954256268a Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
Juan Linietsky
0e1510214a small fixes 2015-06-01 23:35:23 -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
Rémi Verschelde
d9e8cd4dde Add input mapping GUI demo 2015-05-20 17:38:41 +02:00
Juan Linietsky
221443c5a2 more fixes
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
2015-05-19 21:36:35 -03:00
Juan Linietsky
b6b346e8ae added a built-in scene changer API, closes #1928 2015-05-17 16:33:35 -03:00
Juan Linietsky
8482611f81 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-16 17:13:25 -03:00
Juan Linietsky
1e382dbb18 -small motion demo, to better troubleshoot 2015-05-16 17:05:56 -03:00
Juan Linietsky
2882ff1b7e Merge pull request #1881 from NateWardawg/master
Removed redundant code in the kinematic 3D demo.
2015-05-16 13:47:04 -03:00
Juan Linietsky
3936ed882c -Added lookat/get_angle_to functions in 2D, and a demo, closes #1843
-Added get_viewport().get_mouse_pos() to replace Input.get_mouse_pos(), closes #1838
2015-05-12 08:17:09 -03:00
Juan Linietsky
4363798608 -Fixed bug in translation remaps, also added proper demo, maybe fixes #1729 2015-05-12 07:31:15 -03:00
Juan Linietsky
dc3d0bdf38 Translation Demo 2015-05-11 22:34:29 -03:00
Juan Linietsky
17ccd8d9b7 fixs particles on 3d platformer demo, closes #1588 2015-05-11 21:39:42 -03:00
Juan Linietsky
b777bf5ff5 -Updated isometric 2d demo to work using the new isometric support, fixes #1849 2015-05-11 00:40:23 -03:00
Nathan Warden
67bf14bbbb Removed redundant code in the kinematic 3D demo. 2015-05-10 17:39:38 -05:00
Juan Linietsky
a2b8b92a6e -fixed some glitches in isometric light demo, closes #1858 2015-05-10 18:14:38 -03:00
Juan Linietsky
11defcbe21 Merge pull request #1875 from Zamaroht/patch-1
Delete unused variable
2015-05-10 11:33:16 -03:00
Nicolas Laurito
ef8a402f71 Remove focus from restart button, fixes #1850
Fixes a problem where the restart button would keep focus after being pressed, making the tetris' pieces impossible to rotate without activating the button again.
2015-05-10 00:46:16 -03:00
Nicolas Laurito
8f4b6ff870 Deleted unused variable
Deleted the var GRAVITY because it is unused. The gravity is used at line 237, but it's gotten from the Physics2DDirectBodyState parameter.
2015-05-09 19:09:30 -03:00
Juan Linietsky
e090c06ae2 particles in navmesh demo are nice again 2015-05-09 18:17:43 -03:00
Juan Linietsky
158785636c Merge pull request #1852 from SuperUserNameMan/fixes_platformer_3d_particles
fixes_3d_platformer_demo_missing_particles_textures
2015-05-07 20:06:20 -03:00
Juan Linietsky
1e545fc9df Merge pull request #1851 from SuperUserNameMan/fixes_3d_shaders_materials_demo
fixes_demo3d_shaders_materials_missing_light
2015-05-07 20:06:07 -03:00
Juan Linietsky
5f51623547 Merge pull request #1846 from hurikhan/pr_wm_demo_input_fix
window_management demo --  input fix
2015-05-07 20:05:55 -03:00
yg2f
32c0a96249 add_missing_textures_to_particles 2015-05-07 18:29:38 +02:00
yg2f
786b5e3545 fixes_demo3d_shaders_materials_missing_light
add the missing animated light to the demo 3d "shaders materials"
2015-05-07 18:10:30 +02:00
hurikhan
48afa1d284 window_management input fix 2015-05-06 23:07:11 -04:00
Nicolas Laurito
ead2dd3db5 Delete line without functionality 2015-05-06 23:53:20 -03:00
Juan Linietsky
2d396fb710 -More strict argument type-checking, will make many bugs visible, fixes #1809
-added NOTIFICATION_INSTANCED
2015-05-04 18:30:57 -03:00
Juan Linietsky
a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky
4b6225586c Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 00:53:52 -03:00
Juan Linietsky
30f652998d Merge pull request #1738 from jackmakesthings/master
Updating demo engine.cfgs where name is missing
2015-05-03 23:00:26 -03: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
c1eee112f4 fixed bullet in 3d platformer demo 2015-05-01 12:24:20 -03:00
Juan Linietsky
c08597aa64 -fix a bug in extra cull margin, closes #1760 2015-05-01 11:26:23 -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
d3cbabba3d missing file for bbcode demo 2015-04-26 09:48:17 -03:00
jack
ffbe3eeff9 Set name on window management demo's engine.cfg 2015-04-25 22:22:04 -04:00
jack
d066c06e36 Set name on rich text bbcode demo's engine.cfg 2015-04-25 22:21:09 -04:00
jack
f62e09150e Set name on truck-town demo's engine.cfg 2015-04-25 22:20:06 -04:00
jack
891db1e112 Set name on isometric-light demo's engine.cfg 2015-04-25 22:18:57 -04:00
Juan Linietsky
52e2f4606f -Objects with BlendMode!=MIX do not get affected by CanvasModulate, fixes #1724 2015-04-24 23:46:42 -03:00
Juan Linietsky
93ce7d92c1 -Many fixes and demo for RichTexLabel
-Proper ability to edit BBCode in RTL.
2015-04-21 16:01:58 -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
2592f0da9f Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-18 14:17:27 -03:00
Juan Linietsky
be46be7801 -renamed function to get object from instance id
-added function to get list of tiles used
2015-04-18 14:00:15 -03:00
Juan Linietsky
b56badf77b -Added android immersive mode, fixes #303 2015-04-17 16:18:46 -03:00
Juan Linietsky
ed5b939077 scene switcher demo changed to reflect tutorial, fixes #1673 2015-04-12 20:57:26 -03:00
Juan Linietsky
f9906eeac8 -Fixed screen capture for viewports, added a screen capture demo, fixes #1529 2015-04-12 18:58:05 -03:00
Juan Linietsky
ab6eaa3de4 renamed scrts to scripts, fixes #1525 2015-04-12 15:40:08 -03:00
Juan Linietsky
5d99e15e43 fix shadow issue with lights in mix mode, i think fixes #1611 2015-04-03 14:36:10 -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
3920c497b3 Option in Android export to use 32 bits buffer. 2015-03-31 19:02:40 -03:00
Juan Linietsky
ad634876b5 fixes for light2d in androids that do not support
read depth
2015-03-31 14:59:28 -03:00
Juan Linietsky
cbad0440ab 2D normal mapping and lighting simple demos 2015-03-24 16:17:49 -03:00
hurikhan
001a16064f adjust the window_management demo to the new function names 2015-03-23 00:09:12 -04:00
Juan Linietsky
23e13ce3c2 fixes to new window management API
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
2015-03-22 19:00:50 -03:00
Juan Linietsky
15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management
X11 window management
2015-03-22 15:10:50 -03:00
Juan Linietsky
eefcf93e55 Merge pull request #1331 from fry-/master
Add 2D fog of war demo
2015-03-22 15:08:21 -03:00
Juan Linietsky
ca30c87019 Merge pull request #1438 from Spooner/fix_isometric_demo
Fix isometric demo
2015-03-22 14:59:58 -03:00
Juan Linietsky
8c91dadff7 minor comments 2015-03-22 13:01:34 -03:00
Juan Linietsky
1e4841dc52 drag & drop demo (GUI) 2015-03-22 12:52:47 -03:00
Juan Linietsky
78694d8542 gui in 3D demo now uses area for input 2015-03-22 11:52:07 -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
40496dd76a signed distance field fonts demo 2015-03-21 10:15:30 -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
9f88a40e9f simple shader effects library for 2D
ready to use in any project
2015-03-11 01:44:52 -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
hurikhan
f7621810a2 removed up, down, left, right keys from the demo.
were used before for fast multiscreen setup testing.
2015-03-08 09:26:58 -05:00
hurikhan
5241626dee fixing a typo in the demo 2015-03-08 03:32:13 -05:00
hurikhan
ba74e45027 added Label_MouseGrab_KeyInfo 2015-03-08 01:27:36 -06:00
hurikhan
87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08: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
Bil Bas (Spooner)
e7024259e1 Fixed columns to have integer positions, so that they don't "jiggle" when moving the camera. 2015-02-25 17:24:32 +00:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
hurikhan
ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky
2185c018f6 begin new serialization framework
also got rid of STL dependency on triangulator
2015-02-15 01:21:26 -03:00
Juan Linietsky
7ebb224ec1 Merge pull request #1362 from not-surt/tile_map_body_mode
Added body mode property for TileMap as kinematic body
2015-02-14 19:25:35 -03:00
Juan Linietsky
c5f509f238 New Navigation & Pathfinding support for 2D
-Added Navigation & NavigationPolygon nodes
-Added corresponding visual editor
-New pathfinding algorithm is modern and fast!
-Similar API to 3D Pathfinding (more coherent)
2015-02-14 12:10:15 -03:00
Carl Olsson
8bb1e19d73 Replace body_mode property with use_kinematic flag.
Revert 2D Platformer demo's moving platforms to sprite plus body.
2015-02-14 06:43:50 +10:00
Carl Olsson
9d182e93a3 Added body mode property to TileMap to select between static and kinematic physics bodies. Kinematic allow use of TileMaps for moving platforms for example.
Updated 2D Platformer demo to use kinematic TileMaps for moving platforms, in doing so discovered that the tileset was messed up and not converting properly, so fixed that too.
And in order to fix the tileset I need to activate snapping for collision polygon vertices.
2015-02-13 20:49:21 +10:00
hurikhan
a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
hurikhan
df7d26ff5b cleanup + MouseGrab 2015-02-12 15:58:00 +01:00
Bil Bas (Spooner)
58d7678947 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
Conflicts:
	.gitignore
2015-02-10 00:42:28 +00:00
fry-
c21227a636 added preview picture 2015-02-02 23:29:19 +01:00
fry-
2db55ef6fc added a demo for 2D fog of war 2015-02-02 23:08:57 +01:00
hurikhan
03c453ac7d * Cleanup for PR
* Demo shows a Dialog with not implemented methods at startup
2015-01-22 05:35:39 +09:00
hurikhan
2204914abf * observer scene for the demo 2015-01-22 01:54:17 +09:00