14c4c1b568
Merge branch 'master' of https://github.com/okamstudio/godot
2015-06-06 11:09:41 -03:00
954256268a
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
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
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
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
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
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
8dde67cf70
Merge pull request #2030 from romulox-x/iosScreenSize
...
ios screen resolution
2015-06-04 02:03:13 -03:00
ef173a2c9c
improved calculation of screen resolution on ios
2015-06-03 21:57:33 -07:00
f83f96cb44
Add String.to_utf8() and String.to_ascii()
2015-06-04 01:48:52 +02:00
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
0e1510214a
small fixes
2015-06-01 23:35:23 -03:00
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
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
07a466f6e6
mesh preview
2015-05-31 21:13:24 -03:00
6813a1f1e1
Merge pull request #2 from okamstudio/master
...
pull
2015-05-31 01:37:56 -04:00
d5348eebdc
work in progress, resource previews
2015-05-31 02:00:18 -03:00
8130707e01
Haiku: start implementing the os-dependant stuff
2015-05-30 00:57:07 +03:00
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
db459fba1d
Haiku: fix build, link with libGL and libGLEW
2015-05-29 23:36:48 +03:00
513d509783
Haiku: enable building with GLES
2015-05-28 03:42:40 +03:00
8dd674d639
Haiku: enable debug support
2015-05-28 00:59:41 +03:00
dc1940d3e8
Inline get_color_at_offset(). Delete unnecessary check.
2015-05-28 00:11:54 +03:00
f62961aba3
-fix bug in animation editor
...
-fix crash bug in physics motion, closes #1993
2015-05-27 17:30:50 -03:00
57a78ec06b
added conversion from int, string to color
...
fixes #1971
2015-05-27 10:56:57 -03:00
3f975965e9
Add get_color_at_offset(). Ensure correct points order.
2015-05-26 22:17:54 +03:00
70edfcdc8d
Merge pull request #1966 from romulox-x/iosServicesAdditions
...
Improved iOS Game Center functions
2015-05-26 11:41:56 -03:00
b1b7826ea7
oops, previous commit was not working
...
it is working now
2015-05-26 01:30:36 -03:00
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
3826b66a6e
opening data.pcz
2015-05-25 22:42:54 -03:00
c85a526a21
fixed support for zip packages
2015-05-25 22:35:00 -03:00
ec93668f8d
Merge pull request #1 from okamstudio/master
...
improved animation editor
2015-05-25 00:54:24 -04:00
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
a553327043
Haiku: some small fixes
2015-05-25 06:34:16 +03:00
826f8af1ef
Haiku: link with the haiku libs, stub the OS_Haiku class.
2015-05-25 06:02:55 +03:00
4e07a2dea8
Haiku: fix building with UNIX_ENABLED.
2015-05-25 03:49:24 +03:00
b210f52f4a
fix typo error in Color::invert
2015-05-24 19:07:26 -04:00
4a56f72f5b
Haiku: Initial support.
2015-05-24 23:22:51 +03:00
df9d48d9b5
Replace color phases with color ramp for Particles2D.
2015-05-24 21:18:52 +03:00
b459bc5496
Setting build vs properties in scons.
2015-05-24 11:59:31 -06:00
95cd9b1ad5
added response event for game center overlay closing
2015-05-23 23:22:20 -07:00
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
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
f8f3362cab
Merge pull request #1963 from akien-mga/master
...
Fix building release target with debug symbols
2015-05-22 17:23:57 -03:00
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
d3b42e41b0
version bump to stable
2015-05-21 15:03:21 -03:00
bb5d46bb11
Merge branch 'master' of https://github.com/okamstudio/godot
2015-05-21 15:02:49 -03:00
6049479a99
Merge pull request #1951 from akien-mga/master
...
Add input mapping GUI demo
2015-05-20 13:32:34 -03:00
d9e8cd4dde
Add input mapping GUI demo
2015-05-20 17:38:41 +02:00
1e50677594
fixes on sample importing
2015-05-19 23:37:04 -03:00
Juan Linietsky
est31
punto-
romulox_x
Josh Heidenreich
Kyle Luce
reduz
Kevin Choi
Kostadin Damyanov
krzycho
Biliogadafr
Juan Linietsky
Peace Sells
Rémi Verschelde