Commit graph

297 commits

Author SHA1 Message Date
reduz
35b84d2c85 Merge pull request #203 from marynate/PR-fix-collisionshape2d-del-not-update
Fixed #173 #157 Update parent when deleting CollisionShape2D
2014-04-05 09:55:21 -03:00
reduz
1278da71ea Merge pull request #206 from marynate/PR-multijobs-build
Fixed #205 Race condition in build process
2014-04-05 09:54:42 -03:00
reduz
6a737c79fc Merge pull request #211 from sanikoyes/hotfix-render-altas-texture-sprite
fix render sprite used atlas texture position error
2014-04-05 09:42:55 -03:00
reduz
f9820d4c40 Merge pull request #212 from marynate/PR-framelimit
Add ability to apply frame rate limit (application/target_fps)
2014-04-05 09:41:10 -03:00
reduz
ee76837826 Merge pull request #223 from sanikoyes/hotfix-imp-thread-id-in-windows
Implement thread id in windows platform
2014-04-05 09:40:45 -03:00
reduz
c1f4d1c95e Merge pull request #229 from marynate/PR-resizable-window
Add display/resizable to project setting to prevent windwo from resizing
2014-04-05 09:39:19 -03:00
reduz
a643be7170 Merge pull request #230 from hiltonm/hotfix-ignore-doc-data-compressed
Ignore auto-generated doc_data_compressed.h
2014-04-05 09:37:35 -03:00
reduz
266ff7201b Merge pull request #232 from marynate/PR-fix-variant-multiply-bug
Fix Variant vector2/vecotor3 multiply bug
2014-04-05 09:30:56 -03:00
reduz
f0371e6075 Merge pull request #236 from marynate/PR-iOS-FPS60
Lift Godot GLView update frequency from 30 to 60
2014-04-05 09:29:22 -03:00
reduz
d7b93c3776 Merge pull request #237 from marynate/PR-maya-nav
Maya and modo style navigation
2014-04-05 09:28:13 -03:00
reduz
368a14b500 Merge pull request #239 from sanikoyes/hotfix-add-new-anchor-options
Add anchor options "Center"
2014-04-05 09:27:43 -03:00
reduz
d7b7d1ead6 Merge pull request #241 from marynate/PR-viewport-hotkey
Add Viewport Hotkeys / Toggle maximize viewport
2014-04-05 09:27:23 -03:00
reduz
3261b0db72 Merge pull request #242 from marynate/PR-fix-matrix3-binding
Add missing Matrix3::get_scale() binding
2014-04-05 09:26:23 -03:00
reduz
1f5457b2ab Merge pull request #243 from marynate/PR-fix-touchscreenbutton-released
Fix #240 TouchScreenButton release signal is not valid
2014-04-05 09:24:28 -03:00
reduz
64671eb6fb Merge pull request #247 from marynate/PR-path-editor-ui
Path Editor UI Improvment
2014-04-05 09:07:03 -03:00
reduz
1b325a130e Merge pull request #246 from marynate/PR-path2d-editor
Path2D editor bug fix and improvement
2014-04-05 09:06:56 -03:00
marynate
e7463b2b16 Make secondary handle 50% transparent in Path editor to distinguish from
main handle; Add close curve icon in Path editor UI; Fixed mixed EOL
2014-04-03 18:41:43 +08:00
marynate
1076ee12d4 Add close curve icon source image 2014-04-03 18:41:33 +08:00
marynate
9902c80593 Add close curve icon 2014-04-03 18:41:25 +08:00
marynate
a2bd3a1f41 Move point in Path2D edtitor now respect snap configure; Press Alt when
moving point to activate view base snapping; Path2D editor inherits from
HBoxContainer now"
2014-04-03 16:36:01 +08:00
marynate
4c2183bf23 Use shift for control point in Paht2D editor (to be consistent with Path editor) 2014-04-03 16:36:01 +08:00
marynate
f07a377624 Fixed delete path2d node will crash editor 2014-04-03 16:36:01 +08:00
marynate
3b3c4b7585 Fix #244 no path2d handles visible 2014-04-03 16:35:58 +08:00
marynate
4676aac335 Fix #240 TouchScreenButton release signal is not valid 2014-04-02 15:48:02 +08:00
marynate
0a8d2fc6dc Add Matrix3::get_scale() binding 2014-04-01 23:12:17 +08:00
marynate
465f81a37a Space to toggle maximize viewport
Cleanup debug output
2014-04-01 19:09:44 +08:00
marynate
a0fcab0a94 Add hotkey for switching viewports
Hotkey added
2014-04-01 16:49:10 +08:00
marynate
145d069da0 Hold shift to speedup pan/zoom in maya navigation scheme 2014-04-01 00:53:19 +08:00
marynate
4dbf26cba2 Keep selection from been cleared when navigating in 3d viewport
Conflicts:
	tools/editor/plugins/spatial_editor_plugin.cpp
2014-04-01 00:52:47 +08:00
marynate
35bf23859a Fix bug in 3d navigation scheme selection; Add modo navigation scheme 2014-04-01 00:50:15 +08:00
marynate
eb294bb6ea Disable transform operation when navigation 2014-04-01 00:49:48 +08:00
marynate
5ed527d8b8 Add maya style navigation scheme to 3d vieewport 2014-04-01 00:49:26 +08:00
sanikoyes
9174ac7386 Add anchor options "Center" 2014-03-31 19:02:21 +08:00
marynate
7ff0ce7e00 Lift Godot GLView update frequency from 30 to 60 2014-03-31 12:57:05 +08:00
marynate
6e1e66878c Fix Variant vector2/vecotor3 multiply bug 2014-03-29 00:06:25 +08:00
Hilton Medeiros
c943167daf Remove auto-generated doc_data_compressed.h 2014-03-27 15:28:07 -03:00
marynate
f6e6093ab9 Add display/resizable to project setting to prevent windwo from resizing 2014-03-27 23:16:03 +08:00
Hilton Medeiros
b771d20070 Ignore doc_data_compressed.h 2014-03-27 11:36:09 -03:00
sanikoyes
a9d4051ddf Implement thread id in windows platform 2014-03-24 16:06:10 +08:00
sanikoyes
61179e82c7 fix atlas texture algo 2014-03-19 21:02:17 +08:00
sanikoyes
bc4e37b132 fix a mistake 2014-03-19 15:55:12 +08:00
sanikoyes
3037b3f6dc fix render sprite used atlas texture position error 2014-03-19 15:43:56 +08:00
marynate
c0547f5691 Add possibility to limit frame to main loop (application/target_fps)
target-fps working, and use fixed physics step before adding physics-fps in project setting

Complete implementation of framelimit

Conflicts:
	main/main.cpp
2014-03-18 18:00:18 +08:00
marynate
7ca064c3d1 Set multi-jobs build option defaul to no 2014-03-17 11:43:43 +08:00
marynate
ad9bf69283 Fixed #173 #157 When CollisionShape2D deleted, parent CollisionObject should get updated as well 2014-03-15 14:03:51 +08:00
reduz
e20e3c9525 Merge pull request #198 from gamedevsam/master
Fixing compile error related to missing return value from input.cpp
2014-03-13 21:14:58 -07:00
Samuel Batista
c573adb829 Fixing compile error related to missing return value from input.cpp 2014-03-14 00:01:27 -04:00
reduz
bdb5d68e77 Update GodotLib.java 2014-03-13 20:26:38 -07:00
Juan Linietsky
0a717ffee2 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java
2014-03-13 23:14:35 -03:00
Juan Linietsky
31ce3c5fd0 -fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
2014-03-13 22:57:24 -03:00