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

3440 Commits

Author SHA1 Message Date
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
volzhs db89a47e28 This will disable png arm neon optimizing for android template if compile on windows, but make compiling successful. 
And arm neon opt is enabled if not on windows.
 2016-03-07 21:20:32 +09:00
Rémi Verschelde 17e92a896e Merge pull request #3974 from Marqin/master 
migrate to container-based Travis CI
 2016-03-07 13:04:29 +01:00
Hubert Jarosz 1f83ae9b5a migrate to container-based Travis CI 2016-03-07 12:52:50 +01:00
Rémi Verschelde 973f7d56f3 Merge pull request #3972 from Hinsbart/fix_hscroll 
osx: fix inverted horizontal scrolling
 2016-03-07 11:30:09 +01:00
hondres 02eddbf7da osx: fix inverted horizontal scrolling 2016-03-07 11:24:27 +01:00
Paulb23 f19eea2f2d Enabled scrolling past end of file 2016-03-07 02:32:51 +00:00
Saracen 23a4683879 Fix to CPU skinning path when using GPU skinning (meshes with morphs) causing modifications to root bone to have doubled offset and wasted performance. 2016-03-06 18:47:52 +00:00
Rémi Verschelde a283d367a7 Merge pull request #3951 from TheHX/issue-3857 
Fix Project Settings dialog add/delete global variable
 2016-03-06 18:07:19 +01:00
Franklin Sobrinho 48524384d6 Fix Project Settings dialog add/delete global variable 2016-03-06 11:22:21 -03:00
Rémi Verschelde d9ef89f90a Merge pull request #3949 from Hinsbart/fix_trigger_doc 
doc: fix joystick left/right trigger axis description
 2016-03-06 13:56:54 +01:00
hondres 1b806ef54e doc: fix joystick left/right trigger axis description (index 6/7 instead of 4/5) 2016-03-06 13:40:37 +01:00
Rémi Verschelde f8c666085e Merge pull request #3939 from chuckeles/gdscript-doc 
Built-in functions and global scope doc
 2016-03-06 10:38:41 +01:00
Martin Chuckeles ff7c89ebaf Add more verbose build-in functions descriptions 
Add descriptions for some global constants
 2016-03-06 10:34:07 +01:00
Rémi Verschelde 61e63b635c Merge pull request #3927 from TheHX/issue-3645 
Added search box in Class List dialog (Script Editor)
 2016-03-06 09:46:25 +01:00
Rémi Verschelde 754d24612f Merge pull request #3931 from TheHX/issue-3876 
Fix Sprite doesn't updating region_rect value in certain conditions
 2016-03-06 09:45:23 +01:00
Rémi Verschelde 4fb729362b Merge pull request #3932 from TheHX/issue-807 
The help page now show the entire object hierarchy
 2016-03-06 09:43:14 +01:00
Kyle Luce 866e47ec54 Added epoc to dictionary converter 
Useful for when user is storing time as epoc and wants to do operations on this
time and then display in human readable form

https://www.facebook.com/groups/godotengine/permalink/737469773056286/?comment_id=738011009668829&reply_comment_id=738192799650650&notif_t=group_comment_reply
 2016-03-05 12:15:01 -07:00
Franklin Sobrinho fdd1209276 The help page now show the entire object hierarchy 2016-03-05 14:44:39 -03:00
Rémi Verschelde 218bb112e5 Merge pull request #3930 from TheHX/issue-3801 
Removed "__editor_plugin_screen__" metadata creation
 2016-03-05 17:11:26 +01:00
Franklin Sobrinho 1d188c1c7b Fix Sprite doesn't updating region_rect value in certain conditions 2016-03-05 12:30:09 -03:00
Franklin Sobrinho b79e83ad6f Removed "__editor_plugin_screen__" metadata creation 2016-03-05 12:29:16 -03:00
Rémi Verschelde da85fe26a5 Merge pull request #3922 from chuckeles/doc 
GDScript Documentation
 2016-03-05 15:11:05 +01:00
Martin Chuckeles cd1184d56c Write GDScript documentation 2016-03-05 15:06:31 +01:00
Rémi Verschelde 21335e502c Merge pull request #3893 from leezh/diraccess_fix 
Added relative paths for DirAccess::remove()
 2016-03-05 13:13:08 +01:00
Rémi Verschelde 6b1ca582f9 Merge pull request #3920 from Hinsbart/js_echo_keys 
html5: workaround for echo key events.
 2016-03-05 13:05:49 +01:00
Franklin Sobrinho cc6a6ef08c Added search box in Class List dialog (Script Editor) 2016-03-05 07:59:04 -03:00
hondres 352db6b17e html5: workaround for echo key events. 2016-03-04 20:26:39 +01:00
Martin Chuckeles bd7f2590f1 Add special new line opening 2016-03-04 20:10:31 +01:00
Juan Linietsky 5a9b18b665 -Work on addon editor plugin (disabled by default) 
-New HTTPRequest node, to make HTTP requests simpler.
 2016-03-04 11:10:48 -03:00
Rémi Verschelde 3fc80f65cd Merge pull request #3910 from chuckeles/completion-tooltip 
Completion tooltip
 2016-03-04 12:52:59 +01:00
Martin Chuckeles 47206b409d Add editor settings for call hint placement 
Added settings: text_editor/put_callhint_tooltip_below_current_line
and text_editor/callhint_tooltip_offset
 2016-03-04 12:10:15 +01:00
Martin Chuckeles 26cc14e839 Hide hint if completion is active 2016-03-03 20:31:25 +01:00
Martin Chuckeles 03025f60b6 Move the call hint under the current line 2016-03-03 20:26:50 +01:00
Rémi Verschelde 5200ebd8fd Merge pull request #3907 from Stabington/master 
set_time_scale docs
 2016-03-03 10:38:47 +01:00
Stabington 6b7ec5de69 set_time_scale docs 
This is correct?
 2016-03-03 10:07:10 +01:00
Rémi Verschelde 26342b34aa Merge pull request #3898 from volzhs/fix-android-gradle 
fix gradle build on windows
 2016-03-02 07:18:22 +01:00
volzhs d6cc887627 fix gradle build on windows 2016-03-02 12:15:39 +09:00
Rémi Verschelde d0c95ec191 Merge pull request #3894 from akien-mga/pr-revert-3814 
Revert "Merge pull request #3814 from est31/iterators_for_for"
 2016-03-01 19:05:00 +01:00
Rémi Verschelde 002ff3cc9a Revert "Merge pull request #3814 from est31/iterators_for_for" 
This reverts commit adf5056889, reversing
changes made to ee2bc87c0e.
 2016-03-01 18:09:48 +01:00
Rémi Verschelde 46bfcd3507 Merge pull request #3858 from JoshuaGrams/blend3 
AnimationTreePlayer (Blend3): process all inputs.
 2016-03-01 14:02:11 +01:00
Rémi Verschelde c26f753ffe Merge pull request #3757 from JoshuaGrams/animation-tree-blending 
AnimationTreePlayer: blend value tracks (intended to close #2299)
 2016-03-01 14:01:27 +01:00