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

1561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
punto-
70edfcdc8d Merge pull request #1966 from romulox-x/iosServicesAdditions 
Improved iOS Game Center functions
 2015-05-26 11:41:56 -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
Ariel Manzur
3826b66a6e opening data.pcz 2015-05-25 22:42:54 -03:00
Ariel Manzur
c85a526a21 fixed support for zip packages 2015-05-25 22:35:00 -03:00
Kevin Choi
ec93668f8d Merge pull request #1 from okamstudio/master 
improved animation editor
 2015-05-25 00:54:24 -04:00
Juan Linietsky
f36e7dcb40 improved animation editor 
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
 2015-05-25 01:47:02 -03:00
choikwa
b210f52f4a fix typo error in Color::invert 2015-05-24 19:07:26 -04:00
Biliogadafr
df9d48d9b5 Replace color phases with color ramp for Particles2D. 2015-05-24 21:18:52 +03:00
Peace Sells
b459bc5496 Setting build vs properties in scons. 2015-05-24 11:59:31 -06:00
romulox_x
95cd9b1ad5 added response event for game center overlay closing 2015-05-23 23:22:20 -07:00
romulox_x
94638e7bfe added data to descriptions dictionary that was missing. Made the elements that sound weird as plurals consistently singular. changed int arrays to bool arrays in descriptions 2015-05-23 19:04:02 -07:00
romulox_x
93e797f164 Fixed null pointer bug in ios store. added functions to game center to reset the user's achievements, request all the achievements they've made progress on, request descriptions of all possible achievements, and show the built in game center overlay. Upgraded all (I think) deprecated functions to ios 6 versions. as per discussion with reduz on IRC, ios 6 is now the official lowest supported iOS version. compatibility could be added, but it's so obsolete, it's tough to argue for continuing to support it. some naming of functions and dictionary parameters might need to change. I just named them whatever made sense to me :) 2015-05-23 03:17:52 -07:00
Juan Linietsky
f8f3362cab Merge pull request #1963 from akien-mga/master 
Fix building release target with debug symbols
 2015-05-22 17:23:57 -03:00
Rémi Verschelde
5f0bb18d55 Fix building release target with debug symbols 
This forced the -g2 CCFLAG in release builds, making them relatively heavy.
Fixes #1781.
 2015-05-22 22:19:16 +02:00
Juan Linietsky
d3b42e41b0 version bump to stable 2015-05-21 15:03:21 -03:00
Juan Linietsky
bb5d46bb11 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-21 15:02:49 -03:00
Juan Linietsky
6049479a99 Merge pull request #1951 from akien-mga/master 
Add input mapping GUI demo
 2015-05-20 13:32:34 -03:00
Rémi Verschelde
d9e8cd4dde Add input mapping GUI demo 2015-05-20 17:38:41 +02:00
Juan Linietsky
1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky
fec6aaffd8 more fixes 
fix ctrl-a for some cases, mentioned in #1704
fix toggling visibility not updating, fixes #1923
 2015-05-19 23:07:11 -03:00
Juan Linietsky
9f686563d0 fixed latin separation in label, broke it? for cjk 
changed non-separatable character detection so latin works properly.
This is probably incorrect. If you speak chinese, korean or japanese,
please help me fix it.  closes #1935
 2015-05-19 22:26:25 -03: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