maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3531 commits 10 branches 35 tags 1.1 GiB
Commit graph

3531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde
096667fb57 Merge pull request #4040 from SaracenOne/text_editor_undo_fix 
Undo and Redo Text Editor Fix
 2016-03-13 23:51:56 +01:00
Rémi Verschelde
942157bde3 Merge pull request #4027 from Razzlegames/fixMonthConsistency 
Fixes the month consistency issue in enums (OS::Month) and get_date etc
 2016-03-13 23:50:29 +01:00
Kyle Luce
feef563f3f Fixes the month consistency issue in enums and get_date etc 
- Also updated the docs to reflect this.
- Added some vim temp files to gitignore
- Changed NaCL to be consistent with the other OS_Unix::get_date implementation
   (added 1 to month to map to 1-12)

Ticket:
https://github.com/godotengine/godot/issues/4025
 2016-03-13 15:27:39 -07:00
Saracen
b2e471fd7c Undo and redo commands on text editor now affect internal version which fixes inconsistent file saving validation. 2016-03-13 20:08:12 +00:00
Franklin Sobrinho
1f07fe5502 Add icon region support for ItemList 2016-03-13 12:51:19 -03:00
Rémi Verschelde
d36333b648 Remove redundant buttons 
Now the Load button is alone on its line,
we probably need to find it a better place.
 2016-03-13 15:28:03 +01:00
Rémi Verschelde
533b9b7342 Add stop and delete buttons to sample library 
Based on the work by @rdcklinux in #3339.
The play button becomes a stop button while playing.
A delete button is added in the last column.
 2016-03-13 15:28:03 +01:00
Rémi Verschelde
be4d58e120 Merge pull request #3956 from SaracenOne/receive_shadow_flag_fix 
Fix 'FLAG_RECEIVE_SHADOWS' flag for GeometryInstances.
 2016-03-12 18:54:02 +01:00
Rémi Verschelde
801221d01b Remove undefined binds 
Bug introduced by 6eb4812
 2016-03-12 18:53:13 +01:00
Saracen
24bc7d8db7 Fix 'FLAG_RECEIVE_SHADOWS' flag for GeometryInstances so that turning it off now correctly disables shadows from affecting the instance. 2016-03-12 16:51:17 +00:00
Rémi Verschelde
082092267a Merge pull request #3215 from SaracenOne/borderless_windows 
Borderless windows
 2016-03-12 17:40:56 +01:00
Saracen
6eb4812317 Borderless window support for the Win32 build. Default window position is now also centred. 2016-03-12 16:38:12 +00:00
Juan Linietsky
8b1dcbfe4d -Made editor support SSL certs by default (embedded them) 
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
 2016-03-12 10:46:38 -03:00
Juan Linietsky
d85f06c42d -more progress to asset sharing client, but still disabled by default 2016-03-12 10:46:38 -03:00
Rémi Verschelde
6e86a05350 Merge pull request #4012 from sanikoyes/Pr-linke-fail-disable-3d 
Fix link error when disable_3d=yes
 2016-03-11 07:11:23 +01:00
Rémi Verschelde
ebc581becf Merge pull request #4011 from neikeq/fix_regr_3280 
TileSet Export: Avoid invalid error when merge is enabled but file doesn't exist
 2016-03-11 07:10:48 +01:00
sanikoyes
a638af886e Fix link error when disable_3d=yes 2016-03-11 10:01:56 +08:00
Ignacio Etcheverry
897b33ce77 TileSet Export: Avoid invalid error when merge is enabled but file does not exist 2016-03-11 01:20:01 +01:00
Rémi Verschelde
c6e57bf514 Merge pull request #4007 from bojidar-bg/PR-fix-controls 
Fix a crash when running a game with Controls with a tools build
 2016-03-10 22:51:31 +01:00
Bojidar Marinov
bac875be66 Fix a crash when running a game with Controls with a tools build 
Regression from #3997

TOOLS_ENABLED is defined, even when running from editor, but EDITOR_DEF SEGFAULTs
 2016-03-10 21:01:49 +02:00
Rémi Verschelde
aaad24e6fb Merge pull request #3865 from Marqin/coverity 
[Coverity] fixed 11 of 537 potential bugs found by Coverity
 2016-03-10 16:15:49 +01:00
Rémi Verschelde
042f8bf88c Merge pull request #3934 from Razzlegames/epocConvert 
Added epoc to dictionary converter (for human readable display when only given an epoc time)
 2016-03-10 15:00:58 +01:00
Rémi Verschelde
b5f873c9d1 Merge pull request #3999 from neikeq/issues_3650_3990 
Fix crash when resizing ConcavePolygonShape2D segments
 2016-03-10 06:29:20 +01:00
Rémi Verschelde
6ef3c3b645 Merge pull request #3980 from JoshuaGrams/timescale-remainder 
TimeScale node: scale return value (time remaining).
 2016-03-09 20:17:13 +01:00
Rémi Verschelde
c0a6df53a8 Merge pull request #3997 from bojidar-bg/PR-keep-margins 
Add option to keep margins when changing anchors
 2016-03-09 20:15:02 +01:00
Bojidar Marinov
0e8a8d2cb1 Add option to keep margins when changing anchors, closes #3979 
Amend: Fixed an issue for non-tool builds
Amend2: Same, just fixed doing nothing at some times
 2016-03-09 21:14:17 +02:00
Ignacio Etcheverry
3fc16d4025 Fix crash when resizing ConcavePolygonShape2D segments 2016-03-09 19:52:15 +01:00
Josh Grams
65b7791263 TimeScale node: return +inf remaining for 0 scale. 2016-03-09 06:57:28 -05:00
Hubert Jarosz
7b07bcaf44
fix six possible "divide by zero" 2016-03-09 00:18:23 +01:00
Hubert Jarosz
bf7f9244a9 fix two reading uninitialized pointers 
fixed in:
tools/editor/project_settings.cpp
scene/gui/graph_edit.cpp
 2016-03-09 00:16:56 +01:00
Hubert Jarosz
19ea9ae1e5 fix possible crash in tools/editor/editor_import_export.cpp 
da could be NULL, and dereferencing NULL could lead to crash
 2016-03-09 00:16:56 +01:00
Hubert Jarosz
96d6a74e25 fix possible crash in tools/editor/spatial_editor_gizmos.cpp 
spatial_node and base where uninitialized, which could lead to crash
 2016-03-09 00:16:56 +01:00
Hubert Jarosz
4b14c18d13 fix possible crash in platform/x11/joystick_linux.cpp 
ev may be tainted and out of MAX_KEY range,
which will cause joy->key_map[ev.code] to crash
 2016-03-09 00:16:56 +01:00
Rémi Verschelde
e46e43d2aa Merge pull request #3928 from Marqin/whitespace 
remove trailing whitespace - sorry for the broken PRs, please rebase :)
 2016-03-09 00:14:08 +01:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Rémi Verschelde
1dad6eca81 Merge pull request #3991 from JoshuaGrams/issue-3711 
Issue 3711
 2016-03-08 23:54:46 +01:00
Josh Grams
2fa200ff53 AnimationTreePlayer: distinguish value tracks. 
If the node had a 3D Transform, the transform would always get written,
even if the tracks on that node were supposed to be value tracks.
 2016-03-08 17:23:32 -05:00
Juan Linietsky
a3d6768199 Merge pull request #3958 from SaracenOne/cpu_skinning_path_fix 
Fix to CPU skinning path when using GPU skinning (meshes with morphs)
 2016-03-08 15:34:36 -03:00
Juan Linietsky
9157a13aef Merge pull request #3969 from Paulb23/scroll_past_end_of_file 
Enabled scrolling past end of file in text editor.
 2016-03-08 15:34:21 -03:00
Juan Linietsky
7e223cc29a Merge pull request #3981 from SaracenOne/shadow_casting_features 
Added extra controls to GeometryInstances for controlling how shadows are cast.
 2016-03-08 15:33:56 -03:00
Rémi Verschelde
32bb7a04a2 Merge pull request #3833 from AlexHolly/feature-file-md5 
expose md5 for file(s) to gdscript
 2016-03-08 19:32:33 +01:00
Josh Grams
f7fad32188 Variant::blend: add Quat, fix Vector3. 2016-03-08 06:38:19 -05:00
Rémi Verschelde
9509d92149 Merge pull request #3982 from RegalMedia/patch-1 
Update version in Info.plist
 2016-03-08 07:35:56 +01:00
RegalMedia
3d9e26bfce Update version in Info.plist 
Getting info on Godot.app still shows version 1.0.0.  Would be nice to have this reflect the real version number via the build system.
 2016-03-07 20:17:01 -06:00
Saracen
7fecebd8a8 Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. 
Conflicts:
	servers/visual/visual_server_raster.h
 2016-03-07 23:14:14 +00:00
Josh Grams
2e1b1234a3 TimeScale node: scale return value (time remaining). 2016-03-07 17:21:07 -05:00
Rémi Verschelde
20308c0475 Merge pull request #3919 from chuckeles/open-lines-below-above 
Open line below and above
 2016-03-07 20:33:05 +01:00
Rémi Verschelde
84c879b9e9 Merge pull request #3978 from Hinsbart/fix_erase_event 
fix InputMap::action_erase_event()
 2016-03-07 19:10:34 +01:00
hondres
9544042adb fix InputMap::action_erase_event() 
fixes #3976
 2016-03-07 19:00:17 +01:00
Rémi Verschelde
5eeb46da8d Merge pull request #3975 from volzhs/compile-png-on-windows 
fix compiling android templates on windows
 2016-03-07 13:25:12 +01:00