Commit Graph

9612 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
b7ea0502a9 Minor convention fix on CMake build scripts. 2017-04-05 18:16:50 +08:00
Yao Wei Tjong 姚伟忠
420ce387e0 Partial revert on commit f74f4dd so it doesn't have harcoding anymore.
The change in that commit was done before we have introduced the resource prefix path which is more flexible in setting up where the resources can be searched.
2017-04-05 18:16:49 +08:00
Yao Wei Tjong 姚伟忠
f9fe5bc4c2 Remove old/unused options from define_source_files() macro. 2017-04-05 18:16:49 +08:00
Yao Wei Tjong 姚伟忠
2efbcd570c Rename "define_resource_files" macro to "define_resource_dirs".
Enhance it to take extra arguments for specifiying target-specific resource directories and other extra for Web platform support.
Close #809.
2017-04-05 18:16:36 +08:00
orefkov
c6714aa70b Merge remote-tracking branch 'upstream/master' 2017-04-05 01:24:35 +03:00
orefkov
ef5f4ddd12 Add class factories to script api dump. 2017-04-05 01:11:34 +03:00
urho3d-travis-ci
4078b9f842 Travis CI: API documentation update at 2017-04-04 18:11:18 UTC.
[ci package]

Commit: cd6f76f26e

Message: Merge pull request #1856 from eugeneko/master

Improve Box2D integration
2017-04-04 18:11:18 +00:00
Eugene Kozlov
cd6f76f26e Merge pull request #1856 from eugeneko/master
Improve Box2D integration
2017-04-04 21:00:06 +03:00
Eugene Kozlov
29952585b1 Revert contacts auto-disabling. 2017-04-04 10:11:42 +03:00
Eugene Kozlov
eba18bcc99 Add events for b2ContactListener::PreSolve callback. Suppress re-enabling contact on each update. 2017-04-04 09:44:07 +03:00
Eugene Kozlov
fc88f5a32b Expose additional info in PhysicsEvents2D. 2017-04-04 09:44:07 +03:00
Yao Wei Tjong 姚伟忠
240e4d1c54 Fix unnecessary exposure of ik's generated header files. 2017-04-04 13:47:06 +08:00
Yao Wei Tjong 姚伟忠
a24a4f8a4e For CI - fix MinGW AppVeyor CI to get the correct git version number. 2017-04-04 13:44:03 +08:00
urho3d-travis-ci
d59424daae Travis CI: API documentation update at 2017-04-03 23:26:36 UTC.
[ci package]

Commit: 0eb813518a

Message: Merge remote-tracking branch 'origin/TheComet93-InverseKinematics'
2017-04-03 23:26:36 +00:00
Lasse Öörni
0eb813518a Merge remote-tracking branch 'origin/TheComet93-InverseKinematics' 2017-04-03 21:26:17 +03:00
Lasse Öörni
98322561be Minor code formatting. Add contributor. 2017-04-03 21:16:46 +03:00
orefkov
3020b9062a Clearing code. 2017-04-03 20:31:50 +03:00
orefkov
36a2f29580 Fix tabs 2017-04-03 18:48:34 +03:00
orefkov
1d69458d27 Fix particle emitting duration.
Add event for ending particles emitting.
Add event for all particles over.
2017-04-03 17:16:36 +03:00
orefkov
fb9fcfba6c Added the ability to specify a child node by name when setting attribute animation path. 2017-04-03 17:14:34 +03:00
orefkov
2d3f3fd122 Improve AngelScript API dump. 2017-04-03 17:11:47 +03:00
Manuel Freiberger
0a09c97588 Fix Thread::GetCurrentThreadID() if threading is disabled.
When URHO3D_THREADING is not defined, Thread::GetCurrentThreadID() was missing a return statement.
2017-04-02 21:21:29 +02:00
Yao Wei Tjong 姚伟忠
3758048112 Fix mini-urho build. 2017-04-01 23:32:18 +08:00
Yao Wei Tjong 姚伟忠
b3f4b1d9a0 Include memory backtrace source code only when the option is enabled.
Prevent Web platform to enable the memory backtracing build option.
2017-04-01 23:32:14 +08:00
Yao Wei Tjong 姚伟忠
11299ce86e Fix the Lua IK sample crash due to missing bindings. 2017-04-01 21:28:27 +08:00
Yao Wei Tjong 姚伟忠
8c9122ce25 Minor refactoring and cleaning on IK component's code. 2017-04-01 21:28:27 +08:00
Yao Wei Tjong 姚伟忠
e62179f133 Integrate IK sub-library with Urho3D's build system. 2017-04-01 21:28:27 +08:00
Yao Wei Tjong 姚伟忠
a8dcfa2be9 Merge branch 'InverseKinematics' of https://github.com/TheComet93/Urho3D into TheComet93-InverseKinematics 2017-04-01 14:20:56 +08:00
Yao Wei Tjong
f3a596ad42 For CI - another temp fix for Web CI build.
Fix https://github.com/urho3d/urho3d.github.io/issues/20. 
[ci packaging]
2017-03-31 09:47:20 +08:00
urho3d-travis-ci
f2c01b1c00 Travis CI: API documentation update at 2017-03-30 14:09:06 UTC.
[ci package]

Commit: 7bf75955d8

Message: Minor code convention edit to avoid underscore in function name.
2017-03-30 14:09:07 +00:00
Lasse Öörni
7bf75955d8 Minor code convention edit to avoid underscore in function name. 2017-03-30 16:54:59 +03:00
Konstant
795af77d74 Bind ResourceCache::GetResources. 2017-03-30 15:49:07 +02:00
Lasse Öörni
34a45587e9 Add contributor credit. 2017-03-30 11:00:41 +03:00
Lasse Öörni
0b12de174e Merge remote-tracking branch 'cheece/patch-1' 2017-03-30 10:49:55 +03:00
Lasse Öörni
84605eec12 Fix comment. Closes #1884. 2017-03-30 10:29:01 +03:00
Simon Flores
3173c6199c Update Transform.glsl
let the user define the number of outputs for advanced rendering effects such as subsurface scattering
2017-03-29 23:08:31 -04:00
Yao Wei Tjong 姚伟忠
473c6c2380 For CI - temporary fix for web sample upload using default HTML shell.
In future the statically generated page at urho3d.github.io will be the shell for the *.js and *.wasm modules.
[skip appveyor] [ci only: Web]
2017-03-29 22:35:07 +08:00
Yao Wei Tjong 姚伟忠
1bd123ecfb Disable exception handling codegen for Emscripten DEBUG build config.
Urho3D library does not use C++ exceptions feature. Emscripten already disables exception handling by default for -O1 and above.
2017-03-27 23:15:16 +08:00
Lasse Öörni
9df8cfd0a8 Add note on usage of DebugNew.h. Closes #1879. 2017-03-27 11:35:15 +03:00
Lasse Öörni
0a36e92bc9 Add note on using server & client functionality in Network subsystem simultaneously. 2017-03-27 11:30:31 +03:00
Yao Wei Tjong 姚伟忠
cd57326098 Minor documentation update on how to use Urho3D libary. 2017-03-26 22:18:35 +08:00
Yao Wei Tjong 姚伟忠
9d84ccffe4 Initial attempt to support MODULE library type for Web platform.
Disallow memory growth when using MODULE lib-type.
Move the resource defining and checking logic into their own macros.
2017-03-26 22:18:35 +08:00
Lasse Öörni
2e19e8a28f Merge remote-tracking branch 'rokups/feature/move-ui-root-element' 2017-03-24 13:37:29 +02:00
Lasse Öörni
4ab85d993c Merge pull request #1875 from rokups/feature/IntVector2-constants
IntVector2 constants
2017-03-24 10:52:09 +02:00
Rokas Kupstys
ca76683568 IntVector2 constants 2017-03-23 19:27:48 +02:00
Rokas Kupstys
5e9579b23a Allow root UI element to be moved. 2017-03-23 18:09:02 +02:00
Yao Wei Tjong 姚伟忠
5649e9b85b Fix Emscripten build on Windows host system.
[ci skip]
2017-03-23 21:54:34 +08:00
urho3d-travis-ci
c73f0651e7 Travis CI: API documentation update at 2017-03-22 21:12:55 UTC.
[ci package]

Commit: e92c0ee093

Message: Merge pull request #1872 from Florastamine/master

Add Animation::GetTrack(unsigned)
2017-03-22 21:12:55 +00:00
Lasse Öörni
e92c0ee093 Merge pull request #1872 from Florastamine/master
Add Animation::GetTrack(unsigned)
2017-03-22 23:00:53 +02:00
Florastamine
eb9e5c8b6e Fixed coding style; added AngelScript binding. 2017-03-23 01:27:35 +07:00