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

944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
V.VamsiKrishna
9965e93f7e Revert "Removing etc1 from build for javascript platform." 
This reverts commit 41b729ccff.
 2015-03-20 11:12:13 +05:30
V.VamsiKrishna
d3280f91a1 Missed some things in prev commit. 2015-03-20 11:06:28 +05:30
V.VamsiKrishna
41b729ccff Removing etc1 from build for javascript platform. 
Based on inputs from reduz
1) Made etc1 optional driver and default yes.
2) Reverted the hack in rg_etc1.cpp
3) Disabled etc1 for javascript plaform.
 2015-03-20 10:18:13 +05:30
V.VamsiKrishna
72895ddecf Replacing spaces with tabs 2015-03-20 07:47:06 +05:30
V.VamsiKrishna
743b3157bc Fix for newer gcc. Picked from GoogleCode 2015-03-19 10:35:24 +05:30
V.VamsiKrishna
1d45cd0ff1 Fix Javascript build. 2015-03-19 10:31:36 +05:30
Juan Linietsky
9dd0d8277d add overlap test function, remove a semicolon 2015-03-18 21:03:11 -03:00
Juan Linietsky
4cac1e0cb6 add functions to test overlap with another body or area 2015-03-17 09:25:35 -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
5b54361daf Merge pull request #1518 from argylelabcoat/patch-1 
Update file_access_windows.cpp for mingw cross-compile
 2015-03-15 11:56:38 -03:00
Matthew Hughes
1200689245 Update file_access_windows.cpp for mingw cross-compile 
Cross compiling on linux failed on this file. Changing case of the windows.h and shlwapi.h allows mingw to find these headers but setting WINVER 0x0500 is needed for the compiler to find ReplaceFileW
 2015-03-15 09:43:13 -05:00
Juan Linietsky
51b8102f14 Merge pull request #1510 from sanikoyes/Pr-fix-particles2d-bind 
Pr-fix-particles2d-bind
 2015-03-13 23:46:30 -03:00
sanikoyes
7cdd3c86c4 Add missing particles_2d macro bind 2015-03-14 10:40:58 +08:00
Juan Linietsky
0d3b2ea1fd Merge pull request #1504 from marynate/PR-fix-backbuffer-compile 
Fix compile error in back_buffer_copy.h
 2015-03-12 08:27:21 -03:00
marynate
86eedaec21 Fix compile error in back_buffer_copy.h 2015-03-12 14:23:36 +08: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
57380f9aba increase minimum range in property editor a bit 2015-03-10 09:53:22 -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
3fc9017fbb Merge pull request #1491 from marynate/PR-fix-tilemap-compile 
Fix compie error in TileMap::_fix_cell_transform(...)
 2015-03-09 10:00:40 -03:00
marynate
7957709cb1 Fix compie error in TileMap::_fix_cell_transform(...) 2015-03-09 16:28:08 +08: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
a0ee5cc353 time was not being set properly with the rest of the uniforms. 2015-03-02 19:21:46 -03:00
Juan Linietsky
440cc5e4b6 Merge pull request #1437 from Hinsbart/fix_win_joy 
fix get joystick name from registry on some systems
 2015-03-02 01:00:56 -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
Juan Linietsky
0e732637d0 Merge pull request #1459 from romulox-x/blend_with_transparent_background 
changed the blending function when using a transparent render target so ...
 2015-03-01 20:52:20 -03:00
romulox_x
320700fc92 changed the blending function when using a transparent render target so that it blends properly 2015-03-01 15:44:02 -08:00
Juan Linietsky
e15157f289 Merge pull request #1414 from romulox-x/viewport_clear_alpha 
changed viewport clearing to use the alpha value of the clear color, and...
 2015-03-01 18:58:50 -03:00
Hinsbart
9229d9d1bb fix get joystick name from registry on some systems 2015-02-25 16:33:08 +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
Juan Linietsky
57183a7783 Merge pull request #1410 from romulox-x/viewport_clear 
added option to disable automatic clearing of viewport render buffer
 2015-02-21 10:41:53 -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
31e076d16a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-19 18:13:15 -03:00
Juan Linietsky
daeac73c54 restored @ for nodepaths/stringnames 2015-02-19 18:12:45 -03:00
Juan Linietsky
15d97c1e08 Merge pull request #1398 from NateWardawg/rewording 
Changed the tooltip message for instancing a scene.
 2015-02-19 14:29:38 -03:00
Nathan Warden
c6a87d3a50 Changed the tooltip message for instancing a scene. 
- Old wording was misleading as it gave the impression that you could select any node from another scene.
- New wording matches the functionality that you instance the entire scene as a single node.
 2015-02-19 11:15:13 -05:00
Juan Linietsky
3fdf3d8eab -fix compilation of godot server 2015-02-19 11:54:03 -03:00
Juan Linietsky
cf75bf842d -improved pathfinding accuracy 
(i hope?)
 2015-02-19 00:27:02 -03:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
Juan Linietsky
63165d80d5 Merge pull request #1389 from greay/osx_build 
fix a small build error on OS X
 2015-02-18 00:51:28 -03:00
greay
ef565b9778 fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X 2015-02-17 19:19:29 -08:00
reduz
2bea642583 -Some more work on 2D Lights (NOT FUNCTIONAL YET!) 2015-02-16 14:45:11 -03:00
Carl Olsson
0fa1153ea7 Merge branch 'master' of https://github.com/okamstudio/godot into tile_rotation 2015-02-16 05:07:13 +10:00
Juan Linietsky
d7ea20c166 Merge pull request #1371 from erbridge/fix_shadow_declaration 
Fix a shadow declaration
 2015-02-15 16:03:18 -03:00
Felix Laurie von Massenbach
2478935f96 Fix a shadow declaration. 2015-02-15 18:09:11 +00:00