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

1684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Linietsky
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Juan Linietsky
f6957eb154 Merge pull request #2514 from akien-mga/reference-edition 
Document TileMap class
 2015-09-24 18:05:10 -03:00
Juan Linietsky
06d21dfafa Merge pull request #2523 from leezh/boxcontainer-align 
added alignment to BoxContainer
 2015-09-24 10:16:31 -03:00
Zher Huei Lee
c38808b5b1 added alignment to BoxContainer 
Allows aligning contents of VBoxContainer and HBoxcontainer without
having to insert expanding spacers.
 2015-09-24 14:07:53 +01:00
Rémi Verschelde
d55274b5b0 Document TileMap class 2015-09-23 23:05:47 +02:00
Juan Linietsky
20a1c765db Merge pull request #2512 from bojidar-bg/patch-2 
Flip < and > in String::xml_escape.
 2015-09-23 15:43:37 -03:00
Bojidar Marinov
ca11b2fa4b Fix _xml_unescape, as suggested by @reduz 2015-09-23 21:40:24 +03:00
Bojidar Marinov
a7f0846a6b Flip < and > in String::xml_escape. Close #2511 
Before > referred to &lt; and < to &gt;, which is incorrect...
 2015-09-23 21:33:31 +03:00
Juan Linietsky
eea52d44c7 Merge pull request #2504 from vnen/fix-collisionshape-add-bug 
Check if shape is valid before referencing it
 2015-09-23 12:46:15 -03:00
Juan Linietsky
52ad0b0b2a Merge pull request #2509 from bojidar-bg/reference-update 
Update descriptions for Vector2 and Vector2Array
 2015-09-23 11:50:34 -03:00
Juan Linietsky
a3ed71806d Merge pull request #2508 from bojidar-bg/patch-1 
Fix a bug with doctool
 2015-09-23 11:43:03 -03:00
Bojidar Marinov
f41ed99df2 Update descriptions for Vector2 and Vector2Array 2015-09-23 17:41:02 +03:00
Bojidar Marinov
6adb5ed440 Regenerate docs 2015-09-23 17:34:07 +03:00
Bojidar Marinov
38a5e023af Fix a bug with doctool (" >") 
Please test, this was made from GitHub GUI, so couldn't test it myself.
 2015-09-23 17:16:39 +03:00
George Marques
5ff0b69dae
Move the shape test to a little sooner 2015-09-22 21:30:37 -03:00
George Marques
e68f04b9d0 Check if shape is valid before referencing it 
See the comment from @MartiniMoe at #2366.
 2015-09-22 20:27:48 -03:00
Juan Linietsky
4fef36825e Merge pull request #2503 from eska014/master 
Add missing `return` so Visual Studio compiles again
 2015-09-22 09:38:46 -03:00
eska
ab3b0c82c8 Add missing return so Visual Studio compiles 2015-09-22 05:59:10 +02:00
Juan Linietsky
ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -03:00
Juan Linietsky
8f07f24318 remove required argument from streamplayer (was a bug), make it default as 0, closes #2492 2015-09-21 03:47:56 -03:00
Juan Linietsky
205634791c fixed stupid bug caused by accidentally removed line before commit 2015-09-20 17:29:36 -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
Juan Linietsky
3f9e5afe68 begin work on debugging collisions.... 2015-09-18 23:10:58 -03:00
Juan Linietsky
889d21e004 Merge pull request #2352 from xodene/patch-6/script-file-new 
Add "New" script button to Script Editor Popup Menu
 2015-09-16 09:55:10 -03:00
reduz
a2f2d7610a Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-15 22:18:41 -03:00
reduz
2580ca01e6 Ability to keep collisionshapes and collisionpolygons when running the game. 
Works for 2D and 3D
These are still just helpers in case you want to animate them or access them
directly.
Modifying the real shapes is still done via CollisionObject and CollisionObject2D APIs
But an API was added so you can query which shapes from CollisionObject correspond to which CollisionShape.

Have Fun!
 2015-09-15 22:07:03 -03:00
Juan Linietsky
1931d228fa Merge pull request #2469 from vnen/fix-2418 
Set AnimationEditor UndoRedo reference on creation, Fix #2418
 2015-09-14 01:02:36 -03:00
George Marques
1add3b3dac
Set AnimationEditor UndoRedo reference on creation 
Fix #2418
 2015-09-13 16:21:09 -03:00
Juan Linietsky
4773c19e60 Merge pull request #2467 from romulox-x/iphoneSplash 
server build error fixed
 2015-09-12 23:19:12 -03:00
romulox_x
e5730c1c7c fixed server breaking error in previous splash screen commit 2015-09-12 19:15:02 -07:00
Juan Linietsky
89a901c4b6 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-12 10:56:13 -03:00
Juan Linietsky
a88f67821c HTML5 exporter seems to be fully functional 
-user:// filesystem implemented
-default template page could look prettier, help appreciated
 2015-09-12 10:54:47 -03:00
Juan Linietsky
943714c015 Merge pull request #2461 from romulox-x/iphoneSplash 
fixed iOS splash screen
 2015-09-12 00:17:24 -03:00
Juan Linietsky
56c907ad04 fix to builtin freetype defines on linux 2015-09-10 22:15:00 -03:00
Juan Linietsky
751202768c fix to freetype detection 2015-09-10 21:40:34 -03:00
Juan Linietsky
682578f3b3 more c++ include references removed 2015-09-10 20:53:31 -03:00
Juan Linietsky
c7426717d3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 20:31:34 -03:00
Juan Linietsky
83b69f8fef remotion of some c++ includes to avoid dependency on libstdc++ 2015-09-10 20:30:46 -03: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
59e1ad2773 disabling theora for now (will be re-written, re-enabled later) 2015-09-10 13:27:15 -03:00
Juan Linietsky
fad1faddae Removing locatime so this function compiles again. 
I don't think it has any practical use anyway.
 2015-09-10 13:10:23 -03:00
Juan Linietsky
3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky
0fb7b5aa0c HTML5 exporter Improvements 
-Better template handling
-Voice support
-Stream support
 2015-09-10 00:10:54 -03:00
Juan Linietsky
4e8dcc8938 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-09 18:52:47 -03: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
Ariel Manzur
e3e93da6b9 fixed localtime thing for ios, not tested anywhere else 2015-09-09 20:24:38 +00:00
punto-
4d900859e2 ios build with osxcross 2015-09-09 21:57:49 +02:00
Juan Linietsky
2d570ac657 Merge pull request #2427 from volzhs/fix-game-window-resolution 
fix game window runs only 800x600. fix #2426
 2015-09-08 09:18:57 -03:00
volzhs
cf98b44d3f fix game window runs only 800x600 2015-09-05 15:47:23 +09:00