Commit Graph

9612 Commits

Author SHA1 Message Date
Lasse Öörni
9480e201d2 Update Box2D version according to version identifier in code. 2017-02-16 17:53:08 +02:00
urho3d-travis-ci
7c1af59287 Travis CI: API documentation update at 2017-02-16 11:56:12 UTC.
[ci package]

Commit: 472d0dc549

Message: Merge remote-tracking branch '1vanK/master'
2017-02-16 11:56:12 +00:00
Lasse Öörni
472d0dc549 Merge remote-tracking branch '1vanK/master' 2017-02-16 12:16:38 +02:00
luveti
8d7b4b0b58 Make sure to clip undo / redo buffer bounds to the heightMap bounds in the TerrainEditor 2017-02-16 01:14:31 -05:00
luveti
7798f1f2ca Added basic undo / redo support 2017-02-15 23:21:37 -05:00
Yao Wei Tjong 姚伟忠
966c35f475 For CI - revert the cache setup on AppVeyor CI build.
Close #1804 for now. [ci only: master, MinGW]
2017-02-15 22:47:34 +08:00
1vanK
93b880d7d2 Workaround for resetting mass in CreateFixture() and DestroyFixture() 2017-02-15 16:15:43 +03:00
1vanK
c5014a8399 Update Box2D lib, add RigidBody2D::ApplyLinearImpulseToCenter()
Avoid requirement C++11 by Box2D lib
2017-02-15 14:50:27 +03:00
Lasse Öörni
bc7d96d434 Merge branch 'update-libcpuid' 2017-02-14 19:55:53 +02:00
Yao Wei Tjong 姚伟忠
862e350b6f Differentiate build artifacts generated between MinGW and VS.
[cache clear]
2017-02-14 23:11:15 +08:00
Yao Wei Tjong 姚伟忠
c017c2e607 For CI - fix the CI builds on AppVeyor to use the build cache. 2017-02-14 23:10:40 +08:00
luveti
3511050a96 Updates to Terrain Editor
+ Added settings for the currently selected tool. This includes brush size, brush opacity, and brush height
+ Improved the speed of the smoothing algorithm by removing the new Array that was being created
+ Ignore transparent pixels in the smoothing algorithm
+ The "Create Terrain" action now creates a new image, saves it to Textures folder and adds it to the scene
+ Hid the "Paint" tools, as they have yet to be implemented
2017-02-14 00:52:49 -05:00
Lasse Öörni
6a490f05f2 Update LibCpuId to 0.4.0. Closes #1819. 2017-02-13 22:20:48 +02:00
Lasse Öörni
728c3765dd Merge pull request #1824 from 1vanK/master
Allow access to PhysicsWorld2D members from chield classes
2017-02-13 22:20:20 +02:00
1vanK
9263d1c7da Allow access to PhysicsWorld2D members from chield classes 2017-02-13 22:06:42 +03:00
Lasse Öörni
5d19f3d0f4 Merge pull request #1823 from 1vanK/master
GetDerivedComponent for Physics2D to allow using custom PhysicsWorld2D
2017-02-13 18:27:08 +02:00
1vanK
07df060f1f GetDerivedComponent for Physics2D to allow using custom PhysicsWorld2D 2017-02-13 18:24:06 +03:00
Lasse Öörni
00d99c4950 Merge pull request #1821 from 1vanK/master
Editor: F3 also toggle Physics2D debug geometry
2017-02-13 11:37:06 +02:00
1vanK
4b901d2c05 Editor: F3 also toggle Physics2D debug geometry 2017-02-13 12:34:32 +03:00
Florastamine
74e234a63d Updated Assimp to v3.2 2017-02-12 14:10:43 +07:00
luveti
79dc24003c More coding convention updates to Terrain Editor 2017-02-11 23:53:56 -05:00
luveti
d56ccd619d Use 4 spaces instead of tabs in Terrain Editor 2017-02-11 23:50:15 -05:00
luveti
6e250289a8 Merge remote-tracking branch 'github/master' into editor-terrain
# Conflicts:
#	bin/Data/Scripts/Editor.as
#	bin/Data/Textures/Editor/EditorIcons.png
2017-02-11 23:46:00 -05:00
luveti
6950ad7c7d Updated Terrain Editor UI to work with latest version of Urho3D. 2017-02-11 23:41:16 -05:00
Yao Wei Tjong 姚伟忠
85caa88eff For CI - correct typo in the cache setup script. 2017-02-12 02:05:09 +08:00
Yao Wei Tjong 姚伟忠
a9973de026 For CI - adjust the timestamp to achieve incremental build on AppVeyor.
[ci only: master, MinGW]
2017-02-12 01:33:02 +08:00
Lasse Öörni
2821837f2a Remove zero damping from Urho2DConstraints sample to eliminate jittering behavior. Closes #1816. 2017-02-11 15:33:09 +02:00
Lasse Öörni
cdccc64153 Update RampGenerator documentation. Add contributor credit. 2017-02-11 14:30:30 +02:00
Lasse Öörni
131e87e91f Merge remote-tracking branch 'JSandusky/master' 2017-02-11 13:00:15 +02:00
Yao Wei Tjong 姚伟忠
8ac9db6772 For CI - upgrade to the latest Linaro ARM compiler toolchains.
[ci only: ARM]
2017-02-11 13:44:12 +08:00
urho3d-travis-ci
15c2da904e Travis CI: API documentation update at 2017-02-10 10:18:17 UTC.
[ci package]

Commit: 26574dcc27

Message: Add explicit Vector2 & Vector3 constructors taking IntVector2 & IntVector3. Add Graphics::GetSize(). Closes #1814.
2017-02-10 10:18:17 +00:00
Lasse Öörni
26574dcc27 Add explicit Vector2 & Vector3 constructors taking IntVector2 & IntVector3. Add Graphics::GetSize(). Closes #1814. 2017-02-10 11:58:42 +02:00
Yao Wei Tjong 姚伟忠
f77939e7ae For CI - separate MinGW build tree from VS build tree.
Test [cache clear].
2017-02-10 08:08:03 +08:00
Yao Wei Tjong 姚伟忠
71cdfdbf26 Revert "For CI - still exclude tool building for PR build on AppVeyor."
This reverts commit d7bae3aef8.
2017-02-10 08:02:56 +08:00
JSandusky
306daeded5 Change sigma table naming to fit conventions 2017-02-09 13:16:42 -05:00
Yao Wei Tjong 姚伟忠
d7bae3aef8 For CI - still exclude tool building for PR build on AppVeyor.
Unlike Travis, initial build for PR on AppVeyor does not inherit cache from the master branch, thus exclude the tool for faster build time.
2017-02-10 01:39:23 +08:00
Yao Wei Tjong 姚伟忠
949fef6239 For CI - take advantage of AppVeyor's cache mechanism.
Close #1804.
2017-02-10 01:02:04 +08:00
Lasse Öörni
eeff00e2a8 Add contributor. 2017-02-09 16:59:55 +02:00
Lasse Öörni
337056b657 Squashed commit of the following:
commit 53b7204fded9ce69fa69e96b0531a12161c1036d
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Tue Feb 7 13:52:27 2017 -0300

    Restore windows positions when viewportmode switch

    Now the hierarchy and inspector windows will be restored to original state if you switch between viewport_compact and others.

commit 8a15c06ea468fd42268fa3d937433ff624b03a42
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 15:04:43 2017 -0300

    Replaced tabs by spaces.

commit 9663fef07f5dcebc3a78d2e82c875736cb6d1a70
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:56:06 2017 -0300

    Replaced tabs by spaces.

commit 6fbea29b26491675d9783769cc9f01e8f925dabe
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:49:15 2017 -0300

    Replaced tabs by spaces.

commit 6dbe8b451e444391f82c642374f1bcba506035ce
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:48:30 2017 -0300

    Replaced tabs by spaces.

commit 1d3c98689183abcc99271a65fe9ec3d9be5b6ca0
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 14:19:00 2017 -0300

    Fixed stats text position.

commit 9632876aee4470d722872223f62a072cef1e8137
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:54:20 2017 -0300

    Prevent inspector hide if viewport_compact

commit 46775b205bb340dddcb2f1950d9c1912845d36aa
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:52:25 2017 -0300

    Prevent hierarchy hide if viewport_compact

commit b301b244a47c4f374ca7b97f6c06029f95531c5e
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:47:10 2017 -0300

    Replaced .visible by functions.

commit a30879d68d2145c6521a9ed9f7d282e9f63b4404
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:42:51 2017 -0300

    Enable hierarchy/inspector on compact viewport mode.

commit d6f9d2748e96d8f7b76ea875e5079385f4d9af60
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Mon Feb 6 13:30:18 2017 -0300

    Clean version of code

    Now the content of SetCompactMode is inside of SetViewportMode.
    Code commented.
    Now the code match the engine code convention.

commit 9777750d41f6f45701438b65fae20ea008db3f71
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Sat Feb 4 17:21:57 2017 -0300

    Update EditorView.as

commit e00dbbac2a528a535dab2e1bbc24fe91933caf3b
Author: Liichi <lisandrobruzzo@gmail.com>
Date:   Sat Feb 4 17:18:11 2017 -0300

    Added compact option to viewport mode list.
2017-02-09 15:34:36 +02:00
JSandusky
7a3ddb11ee JS: Add IES cookie generation to RampGenerator 2017-02-09 00:48:19 -05:00
Yao Wei Tjong 姚伟忠
c0f6b0dac7 Configure MinGW to use -O2 instead of -O3 for Release build config.
For some reason CMake/MinGW generator uses -O3 for newer MinGW versions. Explicitly set it to -O2 to prevent crashes on 32-bit mode.
Fix #1765.
2017-02-09 01:51:08 +08:00
Lasse Öörni
b167cc1640 Merge pull request #1800 from cosmy1/update-sqlite
Update sqlite
2017-02-07 11:01:37 +02:00
Lasse Öörni
171896ddb4 Hide instead of skip UI element internal vars in AttributeEditor so that indexing works for user-added UI element variables (subindex 0 must always be found in current implementation.) Closes #1788. 2017-02-06 19:00:12 +02:00
Lasse Öörni
13281d9b55 Add links to contributor checklist + code convention to README. 2017-02-06 13:26:47 +02:00
Lasse Öörni
46e1f25eaf Add contributor. 2017-02-06 12:11:45 +02:00
Lasse Öörni
af243bb98c Merge pull request #1799 from mvendra/master
Fixing small typos in comments
2017-02-06 12:10:29 +02:00
cosmy1
bf64ce42f2 Update SQLite to 3.16.2. 2017-02-05 21:22:12 +01:00
cosmy1
478f089239 Update docs. 2017-02-05 21:21:17 +01:00
Mateus Vendramini
78b77ed48f Fixing small typos in comments 2017-02-05 17:33:01 -02:00
Yao Wei Tjong 姚伟忠
68d8681c2b Always use export header for auto-discovering the build options.
Fix #1796.
2017-02-05 21:01:21 +08:00