asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1482 commits 1 branch 0 tags 2.2 GiB
Commit graph

1482 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
Juan Linietsky
89300b70e7 added ability for Area (3D) to detect other areas 2015-06-12 15:52:21 -03:00
Juan Linietsky
8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -03:00
Juan Linietsky
4b35654a02 Update rasterizer_gles2.cpp 
fixed camera plane
 2015-06-12 09:54:19 -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
bc6d91c897 Merge pull request #2051 from jrimclean/master 
oops, thanks
 2015-06-08 14:23:54 -03:00
James McLean
45b453169a Fixed get_packet/put_packet bindings in PacketPeer. 2015-06-08 13:18:18 -04:00
Juan Linietsky
c76900beb8 draw button focus before text and icon 
closes #2047
 2015-06-08 10:36:27 -03:00
Juan Linietsky
7590f3db21 grid container supports separate h and v spacing 
closes #2049
 2015-06-08 10:36:26 -03:00
Juan Linietsky
ade337c340 Delete godot.creator.user.RG2068 2015-06-08 01:35:33 -03:00
Juan Linietsky
f0681d3632 logo in svg curves & license 2015-06-08 01:33:46 -03:00
Juan Linietsky
f052153983 Added Node.find_node(mask) function 
by popular request
 2015-06-08 00:33:10 -03:00
Juan Linietsky
798b55df30 Merge pull request #2044 from est31/fix-win 
Complete fix for windows compilability
 2015-06-07 11:25:14 -03:00
est31
ddba217109 Complete fix for windows compilability 
Thanks @volzhs for testing :)
 2015-06-07 16:12:03 +02:00
Juan Linietsky
a30b2bf5df Merge pull request #2042 from est31/fix-win 
Fix windows compilability
 2015-06-07 10:40:04 -03:00
est31
64704ecbc5 Fix windows compilability 2015-06-07 15:36:14 +02:00
Juan Linietsky
8d61817293 Merge pull request #2037 from est31/use-local-win 
Time zone support
 2015-06-07 00:32:29 -03:00
Juan Linietsky
efbe877005 Merge pull request #2029 from est31/rawarray 
Add String.to_utf8() and String.to_ascii()
 2015-06-07 00:30:37 -03:00
Juan Linietsky
0351e3ae17 Merge pull request #2023 from TheJosh/dae-exporter-assimp 
Fix Blender DAE exporter - files are unreadable by Assimp
 2015-06-07 00:30:07 -03:00
Juan Linietsky
dac398ba58 Merge pull request #2017 from Razzlegames/multitouch_fix_1908 
Additional Fix for Multi-touch release problem
 2015-06-07 00:29:46 -03:00
Juan Linietsky
c7af3146c8 Merge pull request #2007 from Krzycho666/master 
Fixed ui_accept problem
 2015-06-07 00:29:35 -03:00
Juan Linietsky
e4434fe70e Merge pull request #1977 from choikwa/master 
fix typo error in Color::invert, fixes #1967
 2015-06-07 00:28:50 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp 
Replace color phases with color ramp for Particles2D. (need some review/guidance)
 2015-06-07 00:26:35 -03:00
Juan Linietsky
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
Juan Linietsky
b524b40fdc -fixed many memory initialization issues 
-fixed deadlock on previews thread
-fixed compilation errors on unix
 2015-06-06 22:06:58 -03:00
Juan Linietsky
14c4c1b568 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-06 11:09:41 -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
6974823288 Merge remote-tracking branch 'origin/master' 
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
 2015-06-06 10:12:09 -03:00
Juan Linietsky
9acab32daa new file dialog! 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
 2015-06-06 09:44:38 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function 
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
 2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods 
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
 2015-06-06 05:55:28 +02:00
est31
26ea12a873 Use local time for both time and date on win 
On unix and nacl, both date and time are expressed in local time.
 2015-06-06 03:23:34 +02:00
punto-
8dde67cf70 Merge pull request #2030 from romulox-x/iosScreenSize 
ios screen resolution
 2015-06-04 02:03:13 -03:00
romulox_x
ef173a2c9c improved calculation of screen resolution on ios 2015-06-03 21:57:33 -07:00
est31
f83f96cb44 Add String.to_utf8() and String.to_ascii() 2015-06-04 01:48:52 +02:00
Josh Heidenreich
ee04b41a97 Fix DAE exporter - files unreadable by Assimp 
Colours came though as 3x component instead of 4x component.
Index of refraction was in the wrong place.
 2015-06-02 21:15:37 +09:30
Juan Linietsky
0e1510214a small fixes 2015-06-01 23:35:23 -03:00
Juan Linietsky
ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict 
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
 2015-06-01 19:42:34 -03:00
Kyle Luce
77461a126e Additional Fix for Multi-touch release problem 
- Was duplicating the functionality of event.getActionIndex() but was missing the bitmask.
- Switched back to getActionIndex() but kept the corrected getPointerId() from
  change #1980

https://github.com/okamstudio/godot/pull/1908
 2015-05-31 19:37:19 -07:00
reduz
07a466f6e6 mesh preview 2015-05-31 21:13:24 -03:00
Kevin Choi
6813a1f1e1 Merge pull request #2 from okamstudio/master 
pull
 2015-05-31 01:37:56 -04:00
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
krzycho
14c63565ec Fixed ui_accept problem. It's possible now to make a custom ui_accept action event and pull it. 2015-05-29 23:37:23 +02:00
Biliogadafr
dc1940d3e8 Inline get_color_at_offset(). Delete unnecessary check. 2015-05-28 00:11:54 +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
57a78ec06b added conversion from int, string to color 
fixes #1971
 2015-05-27 10:56:57 -03:00
Biliogadafr
3f975965e9 Add get_color_at_offset(). Ensure correct points order. 2015-05-26 22:17:54 +03:00