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 姚伟忠
1243d8bcda Regex replace all the uppercase key bindings with their constants. 2016-06-11 02:56:39 +08:00
Lasse Öörni
8710de6197 Fix pause in NinjaSnowWar. Fix keycodes defined in screen joystick to conform to SDL keycodes (lowercase) 2016-06-10 20:30:40 +03:00
Yao Wei Tjong 姚伟忠
3ab69da3af Use __ANDROID__ compiler define consistently. 2016-06-10 20:28:07 +08:00
Yao Wei Tjong 姚伟忠
991b0c5986 Undefine first before redefine to suppress the compilation warnings. 2016-06-10 19:53:17 +08:00
Yao Wei Tjong 姚伟忠
ff64de61be Initial support for Linux on generic ARM cross-compiling. 
Close #1384.
 2016-06-10 19:14:34 +08:00
Yao Wei Tjong 姚伟忠
5bdd519ce7 Another attempt to reenable AS wrapper for 64-bit ARM platform. 
For CI - switch all the Android CI jobs to use Clang compiler toolchian instead of GCC compiler toolchain. The old GCC 4.9 is not able to handle C++11 standard for AS wrapper. Besides, the latest change log in Android NDK has marked GCC as deprecated and recommended developers to migrate to Clang.
 2016-06-10 17:17:21 +08:00
Yao Wei Tjong 姚伟忠
bfa62a0575 Enhance Android/CMake toolchain file to support NDK r11 new layout. 2016-06-10 17:17:21 +08:00
Yao Wei Tjong 姚伟忠
64d975ba1a Add initial build support for generic ARM platform. 
Add a new build option "ARM_ABI_FLAGS" for supplying additional ABI compiler flags when targeting generic arm.
Fix Linux build from using OpenGLES instead of GLEW, fix RPI build from using wrong OpenGLES library, fix iOS build from using arm-specific compiler flags directly which would cause problem in universal binary build containing iphonesimulator archs as well.
And other minor refactoring.
 2016-06-10 17:17:21 +08:00
Yao Wei Tjong 姚伟忠
2090e84be1 Add contributor credit. 2016-06-10 17:17:20 +08:00
proller
0dc85f14a9 compile on arm arch with opengles2 2016-06-10 17:17:20 +08:00
Lasse Öörni
a1c458f28e Reduce amount of unnecessary Frustum::UpdatePlanes() calls. A default-constructed degenerate frustum no longer has its planes updated on construction, but instead the planes will remain in default-constructed state. 2016-06-10 02:09:50 +03:00
Lasse Öörni
d759a0e51b Call GainFocus() on Input initialization instead of just setting focusedThisFrame_ true. Fixes #1411. 2016-06-09 21:20:42 +03:00
Lasse Öörni
6033ffd116 Fix wrong bool check. 2016-06-09 20:02:57 +03:00
Lasse Öörni
7b18a9a8b2 Slider knob fixed size fix from Lumak. Closes #1412. 2016-06-09 18:47:38 +03:00
Yao Wei Tjong 姚伟忠
3afe44678c Set the compiler flags at the target level when enabling PCH. 
We do not support disabling PCH per compilation unit anymore so we do not need to use custom compiler flags per compilation unit. Using this kind of configuration would result in unwanted target rebuild when the list of compilation unit gets changed due to new/deleted source files for the target in question.
 2016-06-09 20:42:22 +08:00
Lasse Öörni
1535323815 Set default mobile shadow bias adjustments to ineffective since they no longer appear necessary. 2016-06-08 23:49:31 +03:00
Lasse Öörni
ed048b7293 Transmit shadow position to GetShadow() as highp to fix remaining shadow accuracy issue on Android. 2016-06-08 22:50:49 +03:00
Lasse Öörni
f36abeb57c Force highp for shadow related samplers, uniforms & varyings on GLES for better shadows on iOS. Note: may be incompatible for some mobile GPU's that don't support highp at all. 2016-06-08 21:30:31 +03:00
Lasse Öörni
84eca64c6b Use rfc1034identifier modifier for the bundle name so that Urho3D samples build successfully for iOS out of the box. 2016-06-08 20:37:09 +03:00
Lasse Öörni
f6a01c11af Added contributor credit. 2016-06-08 11:30:05 +03:00
ArtemKulyk
cfec9a95bc fix for typo in UTF16 decoder 2016-06-07 18:41:07 +03:00
Lasse Öörni
c98d52c0a3 Prefer to put the instance transform before output variables. 2016-06-06 22:26:37 +03:00
Lasse Öörni
09845225b7 Merge remote-tracking branch 'tungsteen/shaders-merge' 2016-06-06 21:56:10 +03:00
Lasse Öörni
5fa3cff841 Prevent unnecessary fullupdate when node attributes are edited. 2016-06-06 21:30:13 +03:00
Lasse Öörni
b386b76c23 Fix "Is enabled" checkbox getting moved on gizmo / cursor key node editing. Closes #1401. 2016-06-06 20:13:34 +03:00
Sergey Bosko
683ebbdc08 Fix instancing for HLSL water shader 2016-06-06 12:02:59 +02:00
Lasse Öörni
0ed42d0f9d Fix letter accelerator keys not working. Closes #1403. 2016-06-06 11:01:35 +03:00
Yao Wei Tjong 姚伟忠
e260a3354c Revert back to temporarily disable AS wrapper for 64-bit ARM platform. 
The earlier commit lacks the inclusion of logic to enable C++11 standard and boost preprocessor library. However, after locally tested it, it appears that Android NDK 4.9 is not able to able handle it. Need more time to experiment with it in another branch first.
[ci only: Android, OSX] [skip appveyor]
 2016-06-05 23:55:55 +08:00
Yao Wei Tjong 姚伟忠
ccd9dac3c7 Also enable AS wrapper when targeting 64-bit ARM platform. 2016-06-05 22:42:01 +08:00
Yao Wei Tjong 姚伟忠
9345cff42e Remove custom memory adjustment as the default is set to 128 MB now. 2016-06-05 13:17:28 +08:00
Lasse Öörni
cc5761d09d Clean up the code to check for AS_MAX_PORTABILITY define so that it could also come from AS' own config. Minor typo fix. 2016-06-04 17:34:33 +03:00
Lasse Öörni
96451d891e Use the proper form of EMSCRIPTEN define throughout. 2016-06-04 12:33:02 +03:00
Lasse Öörni
fb508365af Fix logic for getting the script file name in web Urho3DPlayer in case arguments were already specified and the command line file is not used. 2016-06-04 12:26:36 +03:00
Lasse Öörni
f097224968 Avoid hardcoding the script file name on web platform Urho3DPlayer. Rather attempt to read from CommandLine.txt later once resources are initialized. Setup a default windowed resolution to match the executable web samples. 2016-06-04 00:21:54 +03:00
Lasse Öörni
d3bc6e000d Add contributor credit. 2016-06-02 20:59:39 +03:00
Lasse Öörni
98dfaf3c75 Add Boost Preprocessor library to Source/ThirdParty. Force C++11 for AngelScript / Emscripten combo. Default to CharacterDemo instead of NinjaSnowWar in Urho3DPlayer on Emscripten due to missing Network subsystem. 2016-06-02 20:55:52 +03:00
Lasse Öörni
0803320a9a Remove mention of AngelScript not being supported on Emscripten. Leave the generic call convention autohandle fix on at all times, since it doesn't hurt. Clarify CommandLine.txt not being able to be read on Emscripten. 2016-06-02 19:27:15 +03:00
Lasse Öörni
5e60325d5f Merge remote-tracking branch 'SirNate0/master' into emscripten-angelscript 2016-06-02 19:10:30 +03:00
urho3d-travis-ci
1cfe5f3967 Travis CI: API documentation update at 2016-06-01 19:15:40 UTC. 
[ci package]

Commit: 37e3c8269d

Message: Added UIBatch::AddQuad overloads which allow defining a quad with arbitrary points & UVs, and optionally colors.
 2016-06-01 19:15:40 +00:00
Lasse Öörni
37e3c8269d Added UIBatch::AddQuad overloads which allow defining a quad with arbitrary points & UVs, and optionally colors. 2016-06-01 22:03:58 +03:00
Lasse Öörni
a3023bf2b3 Add Lua binding for the new tile map type & add contributor credit. 2016-06-01 21:00:36 +03:00
Lasse Öörni
d278bd6a9a Merge remote-tracking branch 'tungsteen/master' 2016-06-01 20:36:11 +03:00
Yao Wei Tjong 姚伟忠
4b03614216 Minor documentation update to mark deprecated methods. 
[ci only: master] [skip appveyor]
 2016-06-01 23:35:58 +08:00
Yao Wei Tjong 姚伟忠
b1e70aa3c6 Use relative path in the C++ API documentation pages. 2016-06-01 19:19:58 +08:00
Lasse Öörni
31f608408d Minor documentation update on scene model. 2016-06-01 13:27:23 +03:00
Yao Wei Tjong 姚伟忠
cfd6233297 Minor doc update on Linux and RPI building prerequisite section. 2016-06-01 17:37:45 +08:00
Sergey Bosko
9c298beb54 Add O_HEXAGONAL type of 2D Map 2016-05-31 10:46:02 +02:00
nathan
618b37519a Fixed indentation of my change to Urho3DPlayer.cpp hardcoding NinjaSnowWar.as for the EMSCRIPTEN build. 2016-05-31 00:37:34 +02:00
nathan
30f9d91bdd Formatted stuff in a format more appropriate for Urho. See previous commit message for build instructions. 
Note that I quadrupled the default emscripten memory size as I found the 32 MB was all but always too small.
 2016-05-31 00:26:39 +02:00
nathan
d7b0604d93 Made Angelscript work on the Emscripten build. Not thoroughly tested!!! 
-Has been tested by running Urho3DPlayer with the 12_PhysicsStressTest script
 (the file copied in place of NinjaSnowWar.as requested)
-built with "-std=gnu++14 -I/usr/include/boost" for the CMAKE_CXX_FLAGS
 and "-I/usr/include/boost" for the CMAKE_C_FLAGS.
  ** /usr/include/boost contains a simlink pointing to itself so that boost/
     preprocessor____ can be found
-Networking still doesn't work, so NinjaSnowWar shouldn't work
-Debug builds did not work for me: see http://urho3d.prophpbb.com/topic2151.html
-Defining FORCE_AS_PORTABLE can be used to force it to use the generic build
 with, for example, a gcc build (which should allow more apples-to-apples
 testing of the efficiency of the bindings)
-Discussion of this work originally at http://urho3d.prophpbb.com/topic2044.html
 2016-05-30 22:32:48 +02:00