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

9612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
ccf6648eb3 Utilize new SDLActivity's get arguments feature. 2016-03-16 01:42:01 +08:00
Yao Wei Tjong 姚伟忠
5bcd5e4b1d Merge SDL 2.0.4 
- Revert back commits from PR #191. The media keys support on Linux/x11 platform will be reinvestigated later.
- Add additional include dir for RPI platform. This change is to keep the original SDL/src/video/raspberry/SDL_rpivideo.h header file happy. Previously we were using a slightly altered header file.
- Merge changes from SDL's android-project template.
- Add new source files for Android platform into SDL's CMakeLists.txt. Use new SDL hint to separate mouse and touch events on Android platform. Strangely though a similar hint does not exist on iOS platform, so we retain our local changes to suppress emulated events on iOS platform.
- Adjust OSX and iOS linker flags to include more frameworks.
- Turn ARC on when compiling Objective-C on iOS platform.
- Enable SDL_WINDOW_ALLOW_HIGHDPI on all Apple platforms. Replace all the SDL_WindowGetSize() call with SDL_GL_GetDrawableSize() call in all the graphics backend implementation classes. The former now returns the number in screen coordinates while the latter returns the number in pixels suitable for setting up the glViewport.
- Always use fullscreen mode for iOS platform. Revert back local changes in SDL src/video/uikit/SDL_uikitviewcontroller.m.
 2016-03-16 01:09:49 +08:00
Yao Wei Tjong 姚伟忠
295b0a95b3 Squashed 'Source/ThirdParty/SDL/' content from commit 707b945 
git-subtree-dir: Source/ThirdParty/SDL
git-subtree-split: 707b945bbe9bd41cdb462337d4207efc7165d781
 2016-03-16 01:05:38 +08:00
Yao Wei Tjong 姚伟忠
714014baff Merge commit '295b0a95b345c060ea489ab6111cb4fff13124fd' as 'Source/ThirdParty/SDL' 2016-03-16 01:05:38 +08:00
Yao Wei Tjong 姚伟忠
d8a39273da Replace Source/ThirdParty/SDL subdirectory with subtree. 2016-03-16 01:05:35 +08:00
Lasse Öörni
28fb9e7b88 Merge remote-tracking branch '1vanK/master' 2016-03-15 11:55:03 +02:00
Lasse Öörni
07ade6e110 Don't call DebugRenderer::SetView() if viewport debug rendering is off. Fixes #1244. 2016-03-15 11:40:32 +02:00
Blue, The Magnificent
d62b51289e Reflect the global variable implementation in the documentations and angelscript api 2016-03-15 06:47:48 +01:00
Blue, The Magnificent
864a455572 script scoped global variable not needed anymore 2016-03-15 06:47:08 +01:00
Blue, The Magnificent
f3b505ad26 Add binding for global variables getter and setter in angelscript and lua 2016-03-15 06:46:34 +01:00
Blue, The Magnificent
f1864f498a implement application wide global variable 2016-03-15 06:44:52 +01:00
Ivan K
8842604c80 Fix ToolTip border; EditorHierarchyWindow: tabs to spaces, fix ResetButton ImageRect 2016-03-15 03:36:04 +04:00
urho3d-travis-ci
23bda782ca Travis CI: API documentation update at 2016-03-14 19:34:55 UTC. 
[ci package]

Commit: 18f3204c14

Message: Change textureEdgeOffset to be pixels to work similarly regardless of texture size. Add AngelScript & Lua bindings for it. Change default offset to be 0 to not change existing behavior.
 2016-03-14 19:34:55 +00:00
Lasse Öörni
18f3204c14 Change textureEdgeOffset to be pixels to work similarly regardless of texture size. Add AngelScript & Lua bindings for it. Change default offset to be 0 to not change existing behavior. 2016-03-14 21:17:32 +02:00
OvermindDL1
48346b278c Fix Sprite2D edge bleeding via new member variable. 2016-03-14 21:17:32 +02:00
Lasse Öörni
f4e8b7586a Merge pull request #1242 from 1vanK/master 
UITemplate
 2016-03-14 14:05:48 +02:00
Ivan K
bd546962b3 UITemplate: UI.png was separated to named layers for easy editing (GIMP 2.8.2) 2016-03-14 14:10:22 +04:00
Lasse Öörni
6869970375 Merge pull request #1240 from 1vanK/master 
tabs to spaces
 2016-03-14 00:11:41 +02:00
Ivan K
5f1f311535 tabs to spaces 2016-03-14 00:12:25 +04:00
Lasse Öörni
01cd737909 Hide tooltip if the target element becomes invisible. Possible fix for #1238. 2016-03-13 14:46:23 +02:00
Lasse Öörni
451f713a19 Add contributor credit. 2016-03-12 15:40:55 +02:00
ssinai1
ff4d5b4125 Fix terrain index data 2016-03-11 22:53:02 +01:00
urho3d-travis-ci
4cf41f1346 Travis CI: API documentation update at 2016-03-10 14:31:49 UTC. 
[ci package]

Commit: 1fba0c80de

Message: Document additive animation blending.
 2016-03-10 14:31:49 +00:00
Lasse Öörni
1fba0c80de Document additive animation blending. 2016-03-10 16:09:51 +02:00
Lasse Öörni
33bea5392d Rename AnimationBlendingMode to AnimationBlendMode for brevity and similarity with Graphics class BlendMode. Rename ABM_OVERRIDE to ABM_LERP. Implement weight to additive blending. Serialize blend mode over network for AnimationController. 2016-03-10 15:49:37 +02:00
Lasse Öörni
33d9dafc0c Merge remote-tracking branch '1vanK/master' 2016-03-10 14:42:51 +02:00
Lasse Öörni
aa48f333b3 Only update View3D rendertarget when it's visible in the UI. Closes #1228. 2016-03-09 15:07:23 +02:00
Lasse Öörni
49ce2984fe Generate skinning information if animated model has non-skinned subgeometries. Closes #1227. 2016-03-09 14:14:39 +02:00
Lasse Öörni
a2b05dc0fd Add "Tags" Russian localization from 1vanK. 2016-03-09 11:49:36 +02:00
Lasse Öörni
f68d8a6333 Merge pull request #1229 from cosmy1/patch-2 
Add missing translation in editor strings (FR, IT)
 2016-03-09 11:45:55 +02:00
cosmy1
9f59f28aad Add missing translation in editor strings (FR, IT) 2016-03-09 03:40:58 +01:00
Lasse Öörni
2e96545687 Output warning in AssetImporter when model has bones and consists of many submeshes, some of which don't have skinning information. 2016-03-09 00:38:47 +02:00
Ivan K
4e1eb4df74 AniamtionCotrol supports animation blending 2016-03-08 14:02:12 +04:00
Lasse Öörni
192459f61b Added contributor credit. 2016-03-08 10:13:00 +02:00
Lasse Öörni
27a290bf66 Add .hdr to image & texture picker filter lists. 2016-03-08 01:48:06 +02:00
Lasse Öörni
379ceac550 Update STB library versions in the documentation. 2016-03-08 01:34:25 +02:00
Lasse Öörni
21e9ea07f2 Restore stb_image header credits. 2016-03-08 01:32:40 +02:00
Lasse Öörni
970ebe85db Merge remote-tracking branch 'dragonCASTjosh/STB_Update' 2016-03-08 01:31:31 +02:00
Lasse Öörni
6afb1bb164 Remove the uint overloads of Min() & Max() for now as they could lead to AngelScript ambiguous overload errors if the script author is not careful. 2016-03-06 15:30:48 +02:00
Lasse Öörni
d9a295a595 Re-enable the unsigned/signed mismatch warning. Code cleanup. 2016-03-06 15:10:34 +02:00
Lasse Öörni
039542e91c Warning, compile & script binding fixes related to MathDefs.h. Use multiple template parameters where necessary to allow e.g. Min() or Max() with mixed int and unsigned values. Silence repeated warnings in MathDefs.h on MSVC. 2016-03-05 23:47:49 +02:00
TheComet
f8760c8e5a Trig functions are now templated 2016-03-05 22:20:21 +02:00
TheComet
62d8143aa3 Template versions of math functions 2016-03-05 22:20:09 +02:00
Lasse Öörni
2cbff0669d Search for a common root up to the scene root node if necessary, if there seem to be multiple skeleton roots. Allow saving animations also when no geometry. To improve animation save in that case, prepend the output filename to animation filename in any case. Closes #1221. 2016-03-05 21:31:01 +02:00
Ivan K
1eeab3f2db Additive animation blending 
Additive animation blending fix

Additive animation blending normalized rotation + bindings
 2016-03-05 23:26:40 +04:00
urho3d-travis-ci
d0c35c2eaf Travis CI: API documentation update at 2016-03-05 14:56:06 UTC. 
[ci package]

Commit: cf92a49696

Message: Since Variant::GetVectorBuffer() returns a new value copy, it doesn't need to be const. Fixes #1226.
 2016-03-05 14:56:06 +00:00
Lasse Öörni
cf92a49696 Since Variant::GetVectorBuffer() returns a new value copy, it doesn't need to be const. Fixes #1226. 2016-03-05 16:37:01 +02:00
Yao Wei Tjong 姚伟忠
64dcd0e41a Do not build Urho3DPlayer when none of the script subsystem is enabled. 
Fix #1224.
 2016-03-05 21:03:29 +08:00
dragonCASTjosh
405e86db46 Removed Unused STB librarys and added Urho specific changes to STB 2016-03-05 12:27:26 +00:00
Lasse Öörni
6b5b6ab4b3 Document node & UI element tagging. Closes #1176. Fixes in scene model documentation. Tabs to spaces in Scene AngelScript API. 2016-03-05 13:13:50 +02:00