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 姚伟忠
24e70ecd60 For Travis-CI - reduce number of samples in Emscripten build. 
Also remove CI build for shared lib type. It is anyway just an emulation as Emscripten does not support dynamic library (yet) and our earlier issue with emar for static lib type has been fully resolved. Test [ci package] for Emscripten.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
a77e24d8ad Enable external project macro users to find and use PackageTool. 
Adjust software packaging for Emscripten.
 2015-02-13 21:31:59 +08:00
hdunderscore
22d0f41943 - Restricted input processing while input focus is false. 
- (Emscripten) Set focus based on page visibility on load.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
bb438ac6d9 Fetch the Emscripten SDL2 port in an orderly fashion. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
85c893a83d Attempt to enable CI build for Emscripten. 2015-02-13 21:31:59 +08:00
hdunderscore
129f2f7dd9 Fixed an issue in Emscripten with mouse jumping when exiting mouse mode MM_RELATIVE (Pointer Lock), and a mouse jump when entering pointer lock for the first time and pressing a mouse button. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
ef38543b5a Merge custom output command into custom target for resource packaging. 
Add additional logic on Windows host to prevent unnecessary re-linking due to repackaging on each build. There is still no easy way on Windows host to skip repackaging though.
Eliminate the 'Application::GetSubsystem<Engine>()' call on each frame.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
e076d037c6 Minor convention and code clean up. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
a66df72ff5 Fix host tool building and relinking dependency. 
Also fix an issue with CMake reconfiguration where the internal cache work against the regeneration of the custom RESOURCE_CHECK target.
 2015-02-13 21:31:59 +08:00
hdunderscore
ee00a78d2b - Fixed hidden OS cursor behaviour in Emscripten. 
- Added a Pointer Lock API request in Emscripten when Input::SetMouseMode(MM_RELATIVE) is called.
- Added an event for mouse mode changing.
- Fixed Emscripten focus change detection.
 2015-02-13 21:31:59 +08:00
Chris Friesen
57eeeb84b1 Fix terrain shader in chrome by explicitly setting precision 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
8471dcf3e4 Add option to package resource dirs and treat those dirs as build deps. 
Fix static library building using emar instead of ar (from host compiler toolchain).
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
639b4ec3f7 Revert back the Urho3D CMake common module. 2015-02-13 21:31:59 +08:00
hdunderscore
92fe5d3c89 -The suffix is important on Windows when running CMake 'execute_process' in enable_pch, otherwise execute_process will not recognize the compiler as a file. 
-Also reduced usr/bin/ar to ar, as it was invalid on Windows.
 2015-02-13 21:29:10 +08:00
Yao Wei Tjong 姚伟忠
6e0ff48059 Suppress linker warnings. Minor doc update. 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
19ab396e74 Add new Emscripten/CMake toolchain file based on Urho3D convention. 
Use EMSCRIPTEN_ROOT_PATH environment variable to specify the root path to the emscripten, instead of the original EMSCRIPTEN environment variable exported in emsdk_set_env.sh.
This is because the original EMSCRIPTEN environment variable name clashes with our build scripts.
 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
e1a64d840e Disable CI build for Emscripten port for now. 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
6763207787 Complet the rebase to master branch. 2015-02-13 21:23:05 +08:00
badpixels
7061421425 Make sure -s USE_SDL=2 is part of compiler command line when building Urho3D library 2015-02-13 21:23:05 +08:00
t
395191e991 eliminate some compiler warnings 2015-02-13 21:23:05 +08:00
t
b596c1de5e more notes and references added to Readme.emscripten.txt 2015-02-13 21:23:05 +08:00
t
9b770dd1f8 add sample build script buildEmscriptenSamples.sh 2015-02-13 21:23:05 +08:00
t
e60cbcdab5 remove glew references in OGLGraphicsImpl.h when building with emscripten 2015-02-13 21:23:05 +08:00
t
5d92f18b46 engine source changes for emscripten 2015-02-13 21:23:05 +08:00
t
8487a2e308 add toolchain file for emscripten 2015-02-13 21:23:05 +08:00
t
6ff6c5fe49 modify Source/CMakeLists.txt for emscripten build options 2015-02-13 21:23:05 +08:00
t
f298cf94a6 add Readme.emscripten.txt 2015-02-13 21:23:05 +08:00
t
731fb90137 add cmake_emscripten.sh 2015-02-13 21:23:05 +08:00
t
65054942e8 delete Controls.cpp and Controls.h from Source/Engine/Network 2015-02-13 21:23:05 +08:00
t
1dfd6eebde move Controls.* from Engine/Network to Engine/Input 2015-02-13 21:23:04 +08:00
t
114ed8f6ff add Readme.emscripten.txt 2015-02-13 21:23:04 +08:00
Yao Wei Tjong 姚伟忠
50ebccdaae Minor update on README.md content and add Urho3D logo. 
[ci skip]
 2015-02-13 13:19:22 +08:00
hdunderscore
3184c2df87 Merge pull request #661 from GKR/bugfix/compilation-error-hdr-variable 
Removal of hdrRendering variable caused compilation error when using the OpenGL renderer
 2015-02-13 11:09:38 +11:00
Gunnar Kriik
b2f4848115 Removal of hdrRendering variable caused compilation error when using the OpenGL renderer 2015-02-12 22:56:40 +01:00
Lasse Öörni
9c3348ed98 Only perform AnimatedModel bone hitbox ray testing when RAY_TRIANGLE is specified, to allow RAY_OBB to test against the whole model's OBB. 2015-02-12 22:45:46 +02:00
Lasse Öörni
785997b596 Removed unused variable. 2015-02-12 22:38:58 +02:00
Lasse Öörni
793a40f48a Use C-style cast as per Urho convention when dealing with primitive types. 2015-02-12 21:59:43 +02:00
Lasse Öörni
5f9ad3237c Merge remote-tracking branch 'stinkfist/Vector-int-uint-Win64' 2015-02-12 21:58:45 +02:00
Stinkfist0
03f6cb137b Fix signed-unsigned conversion warnings that leak into applications using Urho when doing Win64 build. 2015-02-12 16:31:30 +02:00
Lasse Öörni
b96f47db61 Change order of matrix multiplies in GLSL to eliminate need to transpose matrix uniforms and make the order consistent with skinned & instanced rendering. 2015-02-12 00:05:32 +02:00
Lasse Öörni
0990fd72f2 Added Graphics::GetPixelUVOffset() to get the half-pixel offset required by D3D9, avoids #ifdef'ing. Clean up shadow matrix calculation. 2015-02-11 23:21:57 +02:00
Lasse Öörni
06a7412d64 Exclude the "generated" source directory when not including Lua support. 2015-02-11 21:53:27 +02:00
urho3d-travis-ci
e6629d3c8a Travis CI: API documentation update at 2015-02-11 16:43:27 UTC. 
[ci package]
 2015-02-11 16:43:27 +00:00
Lasse Öörni
347a9c9719 Recreate the tab escape sequence from tab character to the dumped AngelScript API. 2015-02-11 18:30:35 +02:00
urho3d-travis-ci
0702003614 Travis CI: API documentation update at 2015-02-10 17:48:35 UTC. 
[ci package]
 2015-02-10 17:48:35 +00:00
Lasse Öörni
5e133eb639 Added file modification remark with credit to prettywriter.h. Added indentation parameter to several SaveXML() functions including Node & Scene. Code convention edit to use String& throughout. Removed outdated remark of being only able to save to File. 2015-02-10 19:32:45 +02:00
Lasse Öörni
70054dd036 Merge remote-tracking branch 'stinkfist/indent' 2015-02-10 18:21:27 +02:00
Stinkfist0
4b9e4f6097 User-configurable indentation for XML and JSON files (AS and Lua bindings included). Closes #591 2015-02-10 17:18:52 +02:00
Yao Wei Tjong 姚伟忠
96a3126557 Fix SpritePacker build on Mac OS X platform. 2015-02-10 00:49:52 +08:00
Lasse Öörni
4354b1709c Tabs to spaces and update copyright year. 2015-02-09 23:44:01 +02:00