Commit Graph

9612 Commits

Author SHA1 Message Date
urho3d-travis-ci
3ccc22f63b Travis CI: API documentation update at 2016-03-05 10:56:18 UTC.
[ci package]

Commit: fc1f05f8dc

Message: Add script binding for SpriteSheet2D::SetTexture().
2016-03-05 10:56:18 +00:00
Lasse Öörni
fc1f05f8dc Add script binding for SpriteSheet2D::SetTexture(). 2016-03-05 12:45:14 +02:00
Lasse Öörni
89a1f84fd1 Code & API convention edits. 2016-03-05 12:32:26 +02:00
Lasse Öörni
d8ddc579c0 Squashed commit of the following:
commit a6fb2a3b49b52dfb559956a6dc3b2f59373f8487
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 15:19:38 2016 -0700

    Added a check to make TmxFile2D::SetInfo return false and do nothing if there is already layer data, likely to pretty well corrupt rendering and possible access invalid memory without it in worst-case.

commit a1e5150f993f92ae84a0513718ee2eee7bbbf2f0
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 15:16:34 2016 -0700

    Helps to return success, was planning for more functionality there, but TmxFile and Tilemaps need an overhaul.

commit 39618ce0713db0246a252e8f7ca8c03d39725338
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:44:33 2016 -0700

    Forgot a pointer...

commit 1f9e5caa3e888deedb7c3be48cfa3726adaaf4fd
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:43:34 2016 -0700

    Removed the .gitignore change, better to build out-of-tree in any case.

commit f56598abdebe33a125769c527495412e759ea532
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 13:31:51 2016 -0700

    Fix TmxFile2D::SetInfo

commit 108b0ccea1f842f676085a43c73613a8ed2bf786
Merge: 4b5d636 75fbe73
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:58:40 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.  Closes urho3d/Urho3D#1202

commit 4b5d6364d67f26ad7ee38257fa2a6026750a93ff
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:56:27 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.  Closes urho3d/Urho3D#1202

commit 75fbe730ef0d8fcc9db7b1831b602836e1093d14
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:56:27 2016 -0700

    Added setter for SpriteSheet2D to actually be able to set a texture.

commit 4352d1283b27665a3090145b6608bf724c73add5
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:41:55 2016 -0700

    Some setters for the Tilemap, but stopped, need to rewrite it to properly fix it, *way* too integrated with the TMX foramt for some reason...

commit 23dd624dbc7ed89658c394c9cac13d33c9d2df74
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 12:25:56 2016 -0700

    Fix gitignore to ignore a build directory

commit bfec381022e57f130b502f8c4877127460e6f351
Merge: 1851f27 281de05
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Feb 19 11:52:00 2016 -0700

    Merge remote-tracking branch 'upstream/master'

commit 1851f27124b5eca2851771df7d4097f97d8d129d
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Sat Nov 15 00:22:39 2014 -0700

    Revert "Spelling fix:  curent -> current"

    This reverts commit 644eed43e9a61b7fedc01a21fb6a17244a815a51.

commit 644eed43e9a61b7fedc01a21fb6a17244a815a51
Author: OvermindDL1 <overminddl1@gmail.com>
Date:   Fri Nov 14 23:43:49 2014 -0700

    Spelling fix:  curent -> current
2016-03-05 12:22:54 +02:00
dragonCASTjosh
5698f9205a Change towards getting STB working on shared 2016-03-04 21:01:59 +00:00
Yao Wei Tjong 姚伟忠
39f73d673d For Travis & AppVeyor - update secret keys. 2016-03-04 01:26:21 +08:00
Yao Wei Tjong 姚伟忠
8c8e4c475a For Travis & AppVeyor - fix the CI mirror branch deletion logic. 2016-03-04 00:47:50 +08:00
Yao Wei Tjong 姚伟忠
873e80e98e For Travis & AppVeyor - do not use 'abort' when skipping deletion.
Pardon our dust.
Related to cac7a8419c
2016-03-03 12:19:19 +08:00
Lasse Öörni
6538f3bb4a Use glReadPixels() workaround to get texture data from rendertargets on GLES. For regular textures this cannot be used. 2016-03-02 18:16:58 +02:00
Yao Wei Tjong 姚伟忠
cac7a8419c For Travis & AppVeyor - simplify the logic for CI mirror deletion.
Attempt to fix issue with CI mirror deletion for VS-CI.
Only apply the verbosity option for msbuild when building RUN_TESTS and not when building other targets.
2016-03-02 23:28:34 +08:00
urho3d-travis-ci
65180c8b80 Travis CI: API documentation update at 2016-03-02 14:23:59 UTC.
[ci package]

Commit: 633a6fa512

Message: Add function to get a per-face image to TextureCube AngelScript API. Similar to GetImage for Texture2D, does not support block compressed formats.
2016-03-02 14:23:59 +00:00
Lasse Öörni
633a6fa512 Add function to get a per-face image to TextureCube AngelScript API. Similar to GetImage for Texture2D, does not support block compressed formats. 2016-03-02 16:14:14 +02:00
dragonCASTjosh
948f99bd6f Merge pull request #3 from urho3d/master
Update from master
2016-03-02 11:40:28 +00:00
Yao Wei Tjong 姚伟忠
3a29bc2f3c Suppress unnecessary debug log entry due to default autoload feature. 2016-03-02 17:46:54 +08:00
Yao Wei Tjong 姚伟忠
f73f9e182f For Travis & AppVeyor - fix rake task for CI mirror branch deletion.
Since the ctest -VV does not reveal anything useful in troubleshooting the 39_CrowdNavigation demo, attempt to increase the verbosity of msbuild output to see it could reveal anything useful.
2016-03-02 17:21:51 +08:00
Yao Wei Tjong 姚伟忠
98006623a8 For Travis CI & AppVeyor - fix the primary/secondary VS CI build setup.
Revert previous changes to do a force push on the 'git subtree add' rake task as it is quite dangerous to do so. Trade off the convenience to prevent potential accident to lose the subtree branch due invalid operation.
2016-03-01 23:18:41 +08:00
dragonCASTjosh
206176eb7a Changes to fix compile errors related to stb_vorbis 2016-02-29 12:59:00 +00:00
Lasse Öörni
84b41355a7 Fix compiling Urho3D without physics. Note that the editor would still be unable to run without physics support compiled in. Closes #1216. 2016-02-29 12:23:50 +02:00
dragonCASTjosh
10a92cd49a changes to CMake to add headers 2016-02-29 00:32:43 +00:00
dragonCASTjosh
f67f35f002 Changes to fix the compile error 2016-02-29 00:23:26 +00:00
dragonCASTjosh
4fb746bfd1 Removed code that no longer is needed (as far as i know) 2016-02-28 23:58:24 +00:00
dragonCASTjosh
103fe32dd1 Now working and Added initial .HDR support 2016-02-28 23:50:21 +00:00
Yao Wei Tjong 姚伟忠
877cfaf384 For AppVeyor - pass '-C Debug' to ctest invocation.
[ci only: VS]
Related to #1200.
2016-02-26 23:36:38 +08:00
Yao Wei Tjong 姚伟忠
a03a9f06a7 For Travis CI - fix .appveyor.yml generation for secondary AppVeyor CI.
Bitten by ancient Ubuntu 12.04 LTS again. Its Rake/yaml module still uses old convention to output "non-specific tag" in front of value with reserved yaml symbols although they are already escaped in quotes.
Related to #1200.
2016-02-26 19:18:30 +08:00
dragonCASTjosh
eea684879b Add define for STB 2016-02-26 11:06:14 +00:00
Yao Wei Tjong 姚伟忠
4cec292342 Attempt to fix secondary AppVeyor CI mirror branch creation.
Related to #1200.
2016-02-26 10:01:43 +08:00
Yao Wei Tjong 姚伟忠
fcbc0030c5 Move the crowd navigation sample unit test out of primary AppVeyor CI.
A new secondary AppVeyor CI mirro branch is now setup just for troubleshooting the offending sample.
Related to issue #1200.
2016-02-25 23:32:53 +08:00
Lasse Öörni
cd6292d358 Merge pull request #1211 from TheComet93/AnimationTrack
Exposing AnimationTrack class as part of the public API
2016-02-25 10:49:39 +02:00
TheComet
b64f4a7c2e Exposing AnimationTrack class as part of the public API 2016-02-24 22:48:56 +01:00
dragonCASTjosh
6313b6f80e Initial Work (May not work) 2016-02-24 11:46:18 +00:00
Lasse Öörni
8c839265f0 Use camera's frustum for Renderer2D culling always. Closes #1191. 2016-02-24 11:51:09 +02:00
Yao Wei Tjong 姚伟忠
6e0a447ebb Break fix for SDL library build when using Raspbian Jessie.
[ci only: RPI] [skip appveyor]
2016-02-22 23:26:41 +08:00
Lasse Öörni
86adac5ff7 When a 2D rigidbody is parented, make sure the transforms are applied in parent->child order. Also apply the world position also for a static or sleeping rigidbody when it's parented, to make sure the simulation and rendering transforms stay in sync. Fix possible issue with null weakptr during physics 2D update. Closes #1183. 2016-02-21 14:14:16 +02:00
urho3d-travis-ci
c070f76ad8 Travis CI: API documentation update at 2016-02-21 10:22:26 UTC.
[ci package]

Commit: 09e1330f5f

Message: Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203.
2016-02-21 10:22:27 +00:00
Lasse Öörni
09e1330f5f Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203. 2016-02-21 12:12:53 +02:00
Yao Wei Tjong 姚伟忠
3582dccabb Partially revert back changes in the FileWatcher class.
The thread needs to be stopped before closing the file watcher on OSX platform to avoid segfault.
Related to e1c5057bee.
2016-02-21 10:31:23 +08:00
Lasse Öörni
4b7307ca2f Always disable use of aligned structs in Bullet API. Closes #1193 and #1134. 2016-02-20 23:18:29 +02:00
Lasse Öörni
281de051a5 Remember to copy shader parameter hash when a material is cloned. Closes #1192. 2016-02-17 19:40:23 +02:00
Lasse Öörni
e1c5057bee Merge remote-tracking branch 'TheComet93/iss1196' 2016-02-17 19:10:26 +02:00
Lasse Öörni
9fa87d54b6 Similar implicit conversion for WeakPtr. 2016-02-15 17:58:35 +02:00
Lasse Öörni
01d98cdf2c Tab to space. Added contributor credit. 2016-02-15 17:46:46 +02:00
Lasse Öörni
67a7c3f2bc Merge remote-tracking branch 'AntonPetrov83/sharedptr-implicit-conversion' 2016-02-15 17:31:24 +02:00
Lasse Öörni
46e434141e Apply & further improve WorldToHeightMap() fix from Lumak. 2016-02-15 17:00:33 +02:00
Lasse Öörni
614742412d Merge pull request #1198 from Enhex/master
Updated PackageTool's options description.
2016-02-15 13:38:31 +02:00
Yao Wei Tjong 姚伟忠
5e41f1fb2e For Travis CI - reduce number of parallel build process for Web-CI. 2016-02-14 15:00:23 +08:00
Enhex
38b2020875 Updated PackageTool's options description. 2016-02-13 18:09:53 +02:00
TheComet
a48f0e57ad fixes #1196 - Filewatcher no longer gets stuck in read() 2016-02-13 01:53:48 +01:00
Антон Петров
a6015e921b Allow implicit conversions of SharedPtr objects. 2016-02-13 01:39:19 +03:00
Lasse Öörni
213be51f92 Fix 2D particle emitter case where it would potentially try to emit more particles than there is space reserved for. Thanks yiown. Closes #1190. 2016-02-11 17:32:35 +02:00
Lasse Öörni
3e15c400ff Fix uninitialized bool variable in editor script. Closes #1189. 2016-02-11 17:24:11 +02:00