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

9886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
urho3d-travis-ci
4a261b1f2c Travis CI: API documentation update at 2016-03-18 02:19:25 UTC. 
[ci package]

Commit: ecb0ee38a2

Message: Added missing include.
 2016-03-18 02:19:25 +00:00
hdunderscore
ecb0ee38a2 Added missing include. 2016-03-18 11:55:37 +11:00
Lasse Öörni
a973d8318d Implement pause/resume by sound type in Audio. Closes #1250. Demonstrate by pausing "Effect" type sounds in NinjaSnowWar when the game is paused. Cut quiet part from beginning of NutThrow sound to reduce perceived audio lag when attacking. 2016-03-17 23:01:55 +02:00
Gunnar Kriik
20c31802db Applied patch to fix undefined reference error when compiling for Wayland on Linux. 
This has been fixed in SDL, but no SDL release has been made that includes this fix.

The SDL fix can be found here:
https://hg.libsdl.org/SDL/rev/330f500d5815

In the mean time, this fixes Urho3D compilation on Linux.
 2016-03-17 19:04:09 +01:00
Yao Wei Tjong 姚伟忠
ccbc15f6a6 Fix MinGW build on Windows host system. 
Close #1247. Close #1251.
 2016-03-18 00:38:13 +08:00
urho3d-travis-ci
8f4884f1fb Travis CI: API documentation update at 2016-03-16 14:36:03 UTC. 
[ci package]

Commit: 3d9ea8eece

Message: Editor: fix some warnings
 2016-03-16 14:36:03 +00:00
Ivan K
3d9ea8eece Editor: fix some warnings 2016-03-16 15:47:39 +02:00
Ivan K
f27c48616d Editor russification 2016-03-16 15:47:38 +02:00
urho3d-travis-ci
e9cd8db735 Travis CI: API documentation update at 2016-03-16 10:07:14 UTC. 
[ci package]

Commit: a9625eae8a

Message: Add contributor credit, fix editor code comment.
 2016-03-16 10:07:15 +00:00
Lasse Öörni
a9625eae8a Add contributor credit, fix editor code comment. 2016-03-16 11:53:14 +02:00
Lasse Öörni
1877fb3b90 Minor space fix in code. Make editor stop itself when minimized and reduce defocused FPS to 10. Increase hierarchy window initial size to match inspector window initial size. 2016-03-16 11:51:17 +02:00
Lasse Öörni
cd920ccab8 Unify line break style in HashMap.h. 2016-03-16 11:26:28 +02:00
Lasse Öörni
cf64853faa Merge remote-tracking branch 'BlueMagnificent/global_variable' 2016-03-16 11:25:51 +02:00
Blue, The Magnificent
bfe39c6a3f Enhancement to global variable implementation 2016-03-15 23:08:01 +01:00
urho3d-travis-ci
385a1538fd Travis CI: API documentation update at 2016-03-15 18:11:17 UTC. 
[ci package]

Commit: be2ae85427

Message: Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on iOS platform.
 2016-03-15 18:11:17 +00:00
Yao Wei Tjong 姚伟忠
be2ae85427 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on iOS platform.
 2016-03-16 01:45:09 +08:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Web platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
3e40a5ebeb Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Windows platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform. 
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
71efb146cb Refactor the CPU instruction extensions detection mechanism. 
Fix SDL build on the latest Raspbian Jessie release.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
14d4e0d378 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Linux, Android, and RPI platforms.
 2016-03-16 01:45:08 +08:00
Lasse Öörni
250bb0e7d1 Include <cstdio> unconditionally in FileSystem.cpp to fix remove() compile error on Emscripten. 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
a09a153f5e Integrate SDL's original CMakeLists.txt into Urho3D build system. 
Close #1046. Close #1123. Close #1172.
 2016-03-16 01:44:11 +08:00
Yao Wei Tjong 姚伟忠
fba647f7f8 Refactor to handle graphics restore similarly between iOS and Android. 2016-03-16 01:42:01 +08:00
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