aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Borderless window support for the Win32 build. Default window position is ↵Saracen2016-03-126-3/+36
| | | | now also centred.
* -Made editor support SSL certs by default (embedded them)Juan Linietsky2016-03-1232-142/+6011
| | | | | | | | | -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.
* -more progress to asset sharing client, but still disabled by defaultJuan Linietsky2016-03-122-3/+93
|
* Merge pull request #4012 from sanikoyes/Pr-linke-fail-disable-3dRémi Verschelde2016-03-111-1/+2
|\ | | | | Fix link error when disable_3d=yes
| * Fix link error when disable_3d=yessanikoyes2016-03-111-1/+2
| |
* | Merge pull request #4011 from neikeq/fix_regr_3280Rémi Verschelde2016-03-111-14/+11
|\ \ | | | | | | TileSet Export: Avoid invalid error when merge is enabled but file doesn't exist
| * | TileSet Export: Avoid invalid error when merge is enabled but file does not ↵Ignacio Etcheverry2016-03-111-14/+11
| | | | | | | | | | | | exist
* | | Merge pull request #4007 from bojidar-bg/PR-fix-controlsRémi Verschelde2016-03-101-1/+6
|\ \ \ | | | | | | | | Fix a crash when running a game with Controls with a tools build
| * | | Fix a crash when running a game with Controls with a tools buildBojidar Marinov2016-03-101-1/+6
|/ / / | | | | | | | | | | | | | | | Regression from #3997 TOOLS_ENABLED is defined, even when running from editor, but EDITOR_DEF SEGFAULTs
* | | Merge pull request #3865 from Marqin/coverityRémi Verschelde2016-03-1012-22/+34
|\ \ \ | | | | | | | | [Coverity] fixed 11 of 537 potential bugs found by Coverity
| * | | fix six possible "divide by zero"Hubert Jarosz2016-03-096-15/+23
| | | |
| * | | fix two reading uninitialized pointersHubert Jarosz2016-03-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | fixed in: tools/editor/project_settings.cpp scene/gui/graph_edit.cpp
| * | | fix possible crash in tools/editor/editor_import_export.cppHubert Jarosz2016-03-091-2/+1
| | | | | | | | | | | | | | | | da could be NULL, and dereferencing NULL could lead to crash
| * | | fix possible crash in tools/editor/spatial_editor_gizmos.cppHubert Jarosz2016-03-092-3/+2
| | | | | | | | | | | | | | | | spatial_node and base where uninitialized, which could lead to crash
| * | | fix possible crash in platform/x11/joystick_linux.cppHubert Jarosz2016-03-091-0/+6
| | | | | | | | | | | | | | | | | | | | ev may be tainted and out of MAX_KEY range, which will cause joy->key_map[ev.code] to crash
* | | | Merge pull request #3934 from Razzlegames/epocConvertRémi Verschelde2016-03-102-3/+73
|\ \ \ \ | | | | | | | | | | Added epoc to dictionary converter (for human readable display when only given an epoc time)
| * | | | Added epoc to dictionary converterKyle Luce2016-03-052-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #3999 from neikeq/issues_3650_3990Rémi Verschelde2016-03-101-8/+12
|\ \ \ \ \ | | | | | | | | | | | | Fix crash when resizing ConcavePolygonShape2D segments
| * | | | | Fix crash when resizing ConcavePolygonShape2D segmentsIgnacio Etcheverry2016-03-091-8/+12
| | |_|/ / | |/| | |
* | | | | Merge pull request #3980 from JoshuaGrams/timescale-remainderRémi Verschelde2016-03-091-2/+7
|\ \ \ \ \ | | | | | | | | | | | | TimeScale node: scale return value (time remaining).
| * | | | | TimeScale node: return +inf remaining for 0 scale.Josh Grams2016-03-091-1/+4
| | | | | |
| * | | | | TimeScale node: scale return value (time remaining).Josh Grams2016-03-071-2/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3997 from bojidar-bg/PR-keep-marginsRémi Verschelde2016-03-093-13/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add option to keep margins when changing anchors
| * | | | Add option to keep margins when changing anchors, closes #3979Bojidar Marinov2016-03-093-13/+32
|/ / / / | | | | | | | | | | | | | | | | Amend: Fixed an issue for non-tool builds Amend2: Same, just fixed doing nothing at some times
* | | | Merge pull request #3928 from Marqin/whitespaceRémi Verschelde2016-03-09386-7660/+7660
|\ \ \ \ | | | | | | | | | | remove trailing whitespace - sorry for the broken PRs, please rebase :)
| * | | | remove trailing whitespaceHubert Jarosz2016-03-09386-7660/+7660
|/ / / /
* | | | Merge pull request #3991 from JoshuaGrams/issue-3711Rémi Verschelde2016-03-082-3/+10
|\ \ \ \ | | | | | | | | | | Issue 3711
| * | | | AnimationTreePlayer: distinguish value tracks.Josh Grams2016-03-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Variant::blend: add Quat, fix Vector3.Josh Grams2016-03-081-1/+7
| |/ / /
* | | | Merge pull request #3958 from SaracenOne/cpu_skinning_path_fixJuan Linietsky2016-03-081-3/+11
|\ \ \ \ | | | | | | | | | | Fix to CPU skinning path when using GPU skinning (meshes with morphs)
| * | | | Fix to CPU skinning path when using GPU skinning (meshes with morphs) ↵Saracen2016-03-061-3/+11
| | | | | | | | | | | | | | | | | | | | causing modifications to root bone to have doubled offset and wasted performance.
* | | | | Merge pull request #3969 from Paulb23/scroll_past_end_of_fileJuan Linietsky2016-03-084-1/+14
|\ \ \ \ \ | | | | | | | | | | | | Enabled scrolling past end of file in text editor.
| * | | | | Enabled scrolling past end of filePaulb232016-03-074-1/+14
| |/ / / /
* | | | | Merge pull request #3981 from SaracenOne/shadow_casting_featuresJuan Linietsky2016-03-0811-24/+129
|\ \ \ \ \ | | | | | | | | | | | | Added extra controls to GeometryInstances for controlling how shadows are cast.
| * | | | | Added extra controls to GeometryInstances to control how they should cast ↵Saracen2016-03-0711-24/+129
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
* | | | | Merge pull request #3833 from AlexHolly/feature-file-md5Rémi Verschelde2016-03-083-0/+21
|\ \ \ \ \ | | | | | | | | | | | | expose md5 for file(s) to gdscript
| * | | | | expose md5 for file(s) to gdscriptAlexander Holland2016-02-253-1/+38
| | | | | |
* | | | | | Merge pull request #3982 from RegalMedia/patch-1Rémi Verschelde2016-03-081-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update version in Info.plist
| * | | | | Update version in Info.plistRegalMedia2016-03-071-2/+2
|/ / / / / | | | | | | | | | | 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.
* | | | | Merge pull request #3919 from chuckeles/open-lines-below-aboveRémi Verschelde2016-03-071-0/+21
|\ \ \ \ \ | | | | | | | | | | | | Open line below and above
| * | | | | Add special new line openingMartin Chuckeles2016-03-041-0/+21
| | | | | |
* | | | | | Merge pull request #3978 from Hinsbart/fix_erase_eventRémi Verschelde2016-03-071-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix InputMap::action_erase_event()
| * | | | | | fix InputMap::action_erase_event()hondres2016-03-071-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #3976
* | | | | | | Merge pull request #3975 from volzhs/compile-png-on-windowsRémi Verschelde2016-03-071-6/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix compiling android templates on windows
| * | | | | | | This will disable png arm neon optimizing for android template if compile on ↵volzhs2016-03-071-6/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows, but make compiling successful. And arm neon opt is enabled if not on windows.
* | | | | | | Merge pull request #3974 from Marqin/masterRémi Verschelde2016-03-071-4/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | migrate to container-based Travis CI
| * | | | | | | migrate to container-based Travis CIHubert Jarosz2016-03-071-4/+26
|/ / / / / / /
* | | | / / / Merge pull request #3972 from Hinsbart/fix_hscrollRémi Verschelde2016-03-071-1/+1
|\| | | | | | | |_|_|/ / / |/| | | | | osx: fix inverted horizontal scrolling
| * | | | | osx: fix inverted horizontal scrollinghondres2016-03-071-1/+1
| | | | | |
* | | | | | Merge pull request #3951 from TheHX/issue-3857Rémi Verschelde2016-03-063-27/+80
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix Project Settings dialog add/delete global variable