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
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
urho3d-travis-ci
0d4d9575cd Travis CI: API documentation update at 2016-05-30 17:58:08 UTC. 
[ci package]

Commit: a794f9e59b

Message: Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++)
 2016-05-30 17:58:08 +00:00
Lasse Öörni
a794f9e59b Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++) 2016-05-30 20:45:13 +03:00
Lasse Öörni
7b44ba098e Merge remote-tracking branch 'cosmy1/scancode-fix' 2016-05-30 20:08:12 +03:00
Lasse Öörni
a3a21a5c68 Merge remote-tracking branch 'cosmy1/escape-fix' 2016-05-30 20:07:59 +03:00
Yao Wei Tjong 姚伟忠
84b5b2cef4 For CI - reuse the copyright bumper function using the same loop. 
[ci skip]
 2016-05-29 16:47:39 +08:00
Yao Wei Tjong 姚伟忠
f151c4e6a8 Regenerate HEAD version of the documentation pages with unique title. 2016-05-29 16:33:24 +08:00
Lasse Öörni
ef212b9290 Fix BillboardSet & Text3D fixed screen size with multiple views. Remove unused variable. Fix potential bug with BillboardSet update LOD timer & fixed screen size (always force update) 2016-05-28 16:02:27 +03:00
Lasse Öörni
a2a794e877 Merge pull request #1396 from 1vanK/master 
Send elapsedTime to UI shader
 2016-05-28 13:27:29 +03:00
1vanK
461a075501 Send elapsedTime to UI shader 2016-05-28 11:01:31 +03:00
cosmy
2c152977c9 Remove extra comment. 2016-05-28 02:30:09 +02:00
cosmy
945c231fd2 Use SDL character key constants. 2016-05-28 02:29:51 +02:00
cosmy
b057434bfa Make escape key name consistent between keycode and scancode. 2016-05-27 13:27:53 +02:00
Lasse Öörni
e6881956fa Fix erroneous wording in physics events. Node collision events aren't sent "to" nodes, rather "by" nodes. 2016-05-27 10:57:09 +03:00
Lasse Öörni
fce6c3162a More informative class description for RenderPath. 2016-05-27 10:42:53 +03:00
Lasse Öörni
6c5bda871f Only need to ensure stroke thickness doesn't go over font size, as negative values are already checked for. 2016-05-26 16:13:48 +03:00
Bengt Soderstrom
49727ce20c Text effect stroke thickness setter value is made absolute 2016-05-26 13:56:18 +02:00
Bengt Soderstrom
3d0ab6e2ca Stroke thickness attribute is kept positive 2016-05-26 13:16:52 +02:00
bengtsts
02abed0da5 Merge pull request #1 from urho3d/master 
Update fork
 2016-05-26 12:04:01 +02:00
urho3d-travis-ci
520f50615c Travis CI: API documentation update at 2016-05-25 20:29:12 UTC. 
[ci package]

Commit: f7ffdd8770

Message: Update LZ4 license text.
 2016-05-25 20:29:12 +00:00
Lasse Öörni
f7ffdd8770 Update LZ4 license text. 2016-05-25 21:37:53 +03:00
Lasse Öörni
eb7eed9ace Merge remote-tracking branch 'cosmy1/lz4-update' 2016-05-25 20:27:44 +03:00
Lasse Öörni
64b2a83869 Add fixed screen size option to Text3D. 2016-05-25 20:16:17 +03:00
urho3d-travis-ci
11557444be Travis CI: API documentation update at 2016-05-25 12:51:39 UTC. 
[ci package]

Commit: caf663eac3

Message: Possibility for BillboardSet / ParticleEffect billboards to be fixed screen size. In this case the billboard size is measured in pixels.
 2016-05-25 12:51:39 +00:00
Lasse Öörni
caf663eac3 Possibility for BillboardSet / ParticleEffect billboards to be fixed screen size. In this case the billboard size is measured in pixels. 2016-05-25 15:39:26 +03:00