Commit Graph

183 Commits

Author SHA1 Message Date
Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Saracen 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
Juan Linietsky 0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky 3337191d5a Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes
Fix default StyleBoxes of MenuButton
2015-11-18 19:43:02 -03:00
Juan Linietsky 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
Juan Linietsky 326781f4c9 Merge pull request #2636 from TheHX/fixed_material
Bind missing FixedMaterial constants, fixes #2628
2015-11-18 19:14:48 -03:00
Juan Linietsky a8f18e1bae Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
2015-11-18 19:14:25 -03:00
Juan Linietsky c0170d3891 Merge pull request #2695 from eska014/add-default-angular-damp
Set World2D default angular damp per global `physics_2d/default_angular_damp`
2015-11-18 19:01:49 -03:00
Ovnuniarchos 0b05739a8b *Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor. 2015-11-18 19:20:50 +01:00
Juan Linietsky b08312b30c -Fixed default theme a little
-Added option to group help pages, fixes #2805
2015-11-18 09:20:46 -03:00
Juan Linietsky 081a236c67 -Merged Script and Help tabs
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
2015-11-17 09:46:08 -03:00
Juan Linietsky 8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -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
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
eska 825bc8b293 Add default focus StyleBox to MenuButton 2015-11-01 10:33:28 +01:00
eska 06e0eba402 Set World2D default angular damp per global `physics_2d/default_angular_damp` 2015-10-28 18:21:45 +01: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
Juan Linietsky d241b2ec1b -work in progress implementation of NDEE's theme It's NOT DONE YET 2015-10-20 23:54:24 -03:00
MarianoGNU 6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
Franklin Sobrinho 1e36f36357 Bind missing FixedMaterial constants, fixes #2628 2015-10-19 08:03:29 -03:00
Juan Linietsky 7d8f187c33 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 15:49:27 -03:00
Juan Linietsky 85a611d1cd -fixes disability to remove instanced nodes when reopening scene. Fixes #2610 2015-10-17 15:48:42 -03:00
MarianoGNU 25324aa506 Fix crash when using a Scalar Uniform node to GraphShader 2015-10-17 15:27:36 -03:00
MarianoGNU a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz 17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
reduz 078a474135 -fixes and more fixes to new scene system, seems stable now..
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-16 19:11:23 -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
Juan Linietsky 52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -03:00
reduz 422929e87f Large improvements on scene packing and management
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03: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
eska ab3b0c82c8 Add missing `return` so Visual Studio compiles 2015-09-22 05:59:10 +02: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 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
Mariano Javier Suligoy c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy a19a653e2c Compile shaders using default values. 2015-08-30 02:44:49 -03:00
Mariano Javier Suligoy ea448cb779 Edit default values. WARNING!!!
Do not merge these changes, default values are not compiled into shaders yet!
2015-08-29 21:09:11 -03:00
Juan Linietsky b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
Mariano Javier Suligoy 54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -03:00
Juan Linietsky 07e9741425 **WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
2015-08-23 20:15:56 -03:00
Mariano Javier Suligoy c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Juan Linietsky 07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy add0105c4e Little fix: don't create an empty undo/redo command when trying to add a second Input GraphNode 2015-07-25 22:05:45 -03:00
Mariano Javier Suligoy 5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Mariano Javier Suligoy 2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Mariano Javier Suligoy bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -03:00
Juan Linietsky 55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
romulox_x acb5cdb574 forgot to add mirroredrepeat flag to flags file. fixed. 2015-06-25 15:41:12 -07:00