townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,836 Commits 3 Branches 3 Tags 168 MiB
upstream-octree
Commit Graph

9836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
c4a92e97b0 Adapt the 'legacy' Android toolchain file to support Android NDK r12b. 
This will be the last time we modify this toolchain file for Urho3D project. We are forced to touch it one last time because we need to bump the NDK version in urho3d/android-ndk repository.
 2016-07-18 22:01:10 +08:00
Mike3D
238f09c53d Fixed TileMap2D::PositionToTileIndex() and use it in tile map sample 2016-07-18 13:18:57 +02:00
SuperWangKai
7a4f79015f Merge pull request #3 from urho3d/master 
Merge urho3d
 2016-07-18 10:43:14 +08:00
Lasse Öörni
ca6d6e54ae Merge pull request #1476 from tommy3/doxygen-comments 
Normal comment to doxygen comment.
 2016-07-16 16:51:48 +03:00
tommy3
808fd992c6 Normal comment to doxygen comment. 2016-07-16 15:30:09 +02:00
tommy3
6fbe9537f4 Normal comment to doxygen comment. 2016-07-16 14:57:28 +02:00
Lasse Öörni
ccf1abec81 Cleanup cameraPos function parameter from GLSL directional billboard code. Fix directional billboard face camera rotation calculation when billboards are in model space (relative to node). Related to #1471. 2016-07-15 22:23:38 +03:00
urho3d-travis-ci
d1802a9092 Travis CI: API documentation update at 2016-07-15 07:58:43 UTC. 
[ci package]

Commit: 761afff122

Message: Fix dir manipulation off by one error in Android DirExists() function. Closes #1470.
 2016-07-15 07:58:43 +00:00
Lasse Öörni
761afff122 Fix dir manipulation off by one error in Android DirExists() function. Closes #1470. 2016-07-15 09:26:19 +03:00
Lasse Öörni
af00713e12 Add Clone() to ParticleEffect & ParticleEffect2D. Closes #1469. 2016-07-15 01:32:33 +03:00
Yusuf Umar
b24bcb8928 No longer need to passing camera position to direction billboard vertex buffer because Urho3D already has default uniform to do the job. 2016-07-13 18:54:18 +07:00
Yao Wei Tjong 姚伟忠
fd9db884b4 Add template version of UIElement::GetChild() methods. 2016-07-11 19:17:52 +08:00
Yao Wei Tjong 姚伟忠
307fac84f5 Minor documentation update about URHO3D_C++11 build option. 2016-07-11 15:30:17 +08:00
Yao Wei Tjong 姚伟忠
5e8ee79f2b Partial revert - use Object as base but keep lifetime management logic. 
Avoid duplicate reference of "window" UI-element.
 2016-07-11 15:25:54 +08:00
Lasse Öörni
9db4af58e5 Simplify returning a new MessageBox to AngelScript. Fix crash due to multiple handling of MessageBox acknowledge when modal status is manually reset. 2016-07-10 22:01:58 +03:00
urho3d-travis-ci
569314697b Travis CI: API documentation update at 2016-07-10 16:27:23 UTC. 
[ci package]

Commit: 4485cb8fa4

Message: Remove unnecessary include.
 2016-07-10 16:27:23 +00:00
Lasse Öörni
4485cb8fa4 Remove unnecessary include. 2016-07-10 19:10:22 +03:00
Lasse Öörni
c38d29a20c Make MessageBox a UIElement subclass for automatic lifetime management through the UI hierarchy. (Use MessageBox:new in Lua for safe operation.) Remove the "test all factories" feature in Engine class (Debug mode) since it would leave a MessageBox in the UI. Use UI root size for centering the MessageBox instead of Graphics resolution, since the UI might be scaled. Closes #1439. Closes #634. 2016-07-10 19:03:23 +03:00
Yao Wei Tjong 姚伟忠
9183bdfc4e Fix URHO3D_PACKAGING support for Android build. 
When the option is enabled, PackageTool host tool will be built and used to package the assets into pak files.
 2016-07-08 22:38:08 +08:00
Yao Wei Tjong 姚伟忠
3b1575fe0b Fix memory linker flags setup for Web build. 
This is a regression issue. We used to configure it globally before moving it to setup_target() macro. There is a pro and con on where to configure the memory linker flag. If we do it globally then we cannot alter the total memory size per target application (if a project has multiple targets). However, since there is a bug in its current implementation in the setup_target() macro, the logic is moved back again to global section a quick fix for this bug. This means we could not have alternative memory size in any of the sample targets, which we do not do anymore after the default memory size has been increased to 128 MB.
 2016-07-08 21:53:27 +08:00
fredakilla
10449971b9 get body properties when body exists 2016-07-08 21:18:11 +08:00
Lasse Öörni
02e1d6dd2c Add performance note of package files on Android. 2016-07-07 15:40:21 +03:00
Lasse Öörni
96d256ed16 Refactor File internal operations to support package files also on Android. Closes #1455. 2016-07-07 15:25:46 +03:00
Lasse Öörni
28ed7c1706 Remove ambiguous WeakPtr initialization from Graphics class. Closes #1459. 2016-07-06 17:36:41 +03:00
Lasse Öörni
2c2c6d26b1 Merge branch 'api-agnostic-headers' 2016-07-06 13:51:17 +03:00
Lasse Öörni
28ad5d5dbd Fix ambiguous operations when C++11 Urho3D features are enabled by using WeakPtr default constructor instead. 2016-07-06 01:39:28 +03:00
Eugene Kozlov
c4424eb514 Make Vector::Buffer() and PODVector::Buffer() public. 2016-07-05 23:01:16 +03:00
Eugene Kozlov
7546a47497 Add initializer list constructor for PODVector. 2016-07-05 23:01:16 +03:00
Eugene Kozlov
5be488233a Add constructors from nullptr for SharedPtr and WeakPtr. 2016-07-05 23:01:16 +03:00
Lasse Öörni
46db9d1e07 Fix mip chain not being complete to 1x1, which could result in black textures on GLES2. 2016-07-05 14:50:20 +03:00
aster2013
270eabd226 Fix #1456. 2016-07-05 15:51:09 +08:00
urho3d-travis-ci
f99577523d Travis CI: API documentation update at 2016-07-04 23:28:16 UTC. 
[ci package]

Commit: 03c95a1519

Message: Add contributor credit & minor edit.
 2016-07-04 23:28:16 +00:00
Lasse Öörni
03c95a1519 Add contributor credit & minor edit. 2016-07-05 02:01:33 +03:00
Lasse Öörni
c611d4a069 Merge remote-tracking branch 'fredakilla/box2d' 2016-07-05 01:54:25 +03:00
Lasse Öörni
df2f7b06a0 When Button sends the Released event, make sure it's yet hovering if the mouse was released on top of it. See issue #1453. 2016-07-04 22:50:40 +03:00
fredakilla
39344c41fe Add b2Contact ptr to E_PHYSICSBEGINCONTACT2D and E_PHYSICSENDCONTACT2D events 2016-07-04 21:47:36 +02:00
Lasse Öörni
ecd3ab2f45 When an autolocalized Text is saved, make sure the stringId is saved instead of the localized text. Make sure the text gets localized even if autoLocalizable & text attributes are in swapped order in the UI xml. Fix Text3D attributes being AM_FILE mode instead of AM_DEFAULT for net replication. Closes #1451. 2016-07-04 20:49:09 +03:00
Lasse Öörni
4e198c2412 Fix wrong return value in HashMap Front() & Back(). 2016-07-04 18:33:38 +03:00
Lasse Öörni
fd5bac385a Since the SDL window is not API-specific, move it into Graphics from GraphicsImpl to simplify code. 2016-07-01 10:17:29 +03:00
Lasse Öörni
eb104906aa Remove API-specific Graphics class headers and code duplication. Closes #1422. 2016-07-01 09:38:39 +03:00
Yao Wei Tjong 姚伟忠
fb881c3360 Use CMake to auto-detect and define _TIMESPEC_DEFINED as necessary. 2016-06-30 21:01:41 +08:00
Lasse Öörni
bdce4b3dba Move API-specific Graphics class member variables to GraphicsImpl. Rename WindowMoved & WindowResized to OnWindow.. to match convention used elsewhere (eg. OnNodeSet) Change windowIcon_ member to WeakPtr to ensure safety in later access. Minor class comment fixes. 2016-06-30 02:11:19 +03:00
Lasse Öörni
e444e50175 Merge pull request #1445 from TheComet93/iss1444 
fixes #1444
 2016-06-29 23:18:33 +03:00
TheComet
7031ae8799 fixes #1444 2016-06-29 19:18:14 +02:00
Lasse Öörni
51b0a16f9a Remove API-specific RenderSurface class headers and RenderSurface code duplication. 2016-06-27 22:42:02 +03:00
Lasse Öörni
46b9a90fb1 Remove API-specific Texture subclass headers and code duplication for loading & SetSize(). 2016-06-26 23:26:14 +03:00
Lasse Öörni
26342ce69e Remove code duplication from checking max. mip levels on OpenGL. 2016-06-26 21:12:20 +03:00
Lasse Öörni
f452a16f2d Initial Texture class refactoring. Get rid of API-specific Texture header. 2016-06-26 20:35:51 +03:00
Lasse Öörni
11b1e2cc2d Shadow batches don't need a zone, since they shouldn't use ambient color or fogging settings. This also fixes a bug with erroneous fog settings when OpenGL constant buffers are used. 2016-06-25 19:52:17 +03:00
Lasse Öörni
6c77b75813 Cleanup ShaderParameter related code. 2016-06-25 17:58:37 +03:00