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
urho3d-travis-ci
129205a9b1 Travis CI: API documentation update at 2017-04-10 18:11:53 UTC. 
[ci package]

Commit: 150c4fb26d

Message: Export some consts to AngelScript
 2017-04-10 18:11:53 +00:00
1vanK
150c4fb26d Export some consts to AngelScript 2017-04-09 22:17:34 +03:00
Lasse Öörni
afc5618d5e Merge remote-tracking branch 'ombre5733/fix-rapidjson-usage' 2017-04-09 19:06:30 +03:00
Lasse Öörni
b13d887569 Merge remote-tracking branch 'ombre5733/fix-particle2d-blendmodes' 2017-04-09 19:06:17 +03:00
Yao Wei Tjong 姚伟忠
403f88da05 Fix Xcode complaining about same resources in multiple groups. 
Tested on both Xcode and AppCode.
 2017-04-09 23:35:31 +08:00
Manuel Freiberger
33179317a6 Populate a newly created rapidjson-value before adding it to the parent. 
When converting JSONValue to rapidsjon::Value, create the array elements and
object properties fully before adding them to rapidjson. This makes the
whole operation more efficient because it avoids a useless lookup on the
newly created/added elements.
 2017-04-09 15:53:24 +02:00
Manuel Freiberger
f37ffb57a8 Fixed blend modes for 2D particles 
The 2D particles had missing blend mode functions for
BlendMode::BLEND_SUBTRACT and BLEND_SUBTRACTALPHA. The values for the
functions have been copied from OGLGraphics.cpp.

If C++11 is enabled, the size of the struct is checked with a static
assertion, now.
 2017-04-09 15:19:55 +02:00
Lasse Öörni
76ae937ceb When texture size is assigned for Texture2D / Texture2DArray / TextureCube, set depth to 1 to allow generic width * height * depth calculations. Closes #1894. 2017-04-08 20:50:44 +03:00
orefkov
1556605471 Clear tabs 2017-04-08 20:50:44 +03:00
orefkov
fa71240346 Add color wheel in editor for Text3D component. 2017-04-08 20:50:44 +03:00
orefkov
e4c5001bfb Copy changes from AngelScript's sources, revision r2382. 
Fixed problem with calling function expecting @&in where the argument was itself a & argument.
https://www.gamedev.net/topic/686912-array-with-objects-handles/
 2017-04-08 20:50:44 +03:00
Yao Wei Tjong 姚伟忠
9daf887f10 Phasing out universal binary build for macOS platform. 
Close #1895.
 2017-04-09 00:04:41 +08:00
Yao Wei Tjong 姚伟忠
ec102aadfc Reorder initialization order to suppress Xcode warnings. 2017-04-08 23:52:44 +08:00
Yao Wei Tjong 姚伟忠
aec2090727 Remove redundant old batch file. 
The resource dirs will be symlinked or (fallback) copied one way or another automatically now.
 2017-04-07 22:26:06 +08:00
Yao Wei Tjong 姚伟忠
7ec1448c07 Minor clean up to avoid code duplication. 2017-04-07 22:12:13 +08:00
Yao Wei Tjong 姚伟忠
3ad02295c7 Prevent resource symlink creation when performing resource packaging. 
Incidentally, the extra symlinks in the Web CI build has caused static site generation error since yesterday. So this should fix that as well.
 2017-04-07 00:13:59 +08:00
urho3d-travis-ci
0ae20c528b Travis CI: API documentation update at 2017-04-05 19:35:46 UTC. 
[ci package]

Commit: dd0caa6ab7

Message: Move ParticleEmitter2D events into Urho2DEvents header file. Add event parameters and safeguard for event handling causing component destruction. Add contributor credit.
 2017-04-05 19:35:46 +00:00
Lasse Öörni
dd0caa6ab7 Move ParticleEmitter2D events into Urho2DEvents header file. Add event parameters and safeguard for event handling causing component destruction. Add contributor credit. 2017-04-05 22:23:13 +03:00
Lasse Öörni
f1513fcaae Allow name-based child attribute animation also on UIElement. 2017-04-05 21:54:37 +03:00
PredatorMF
1bbcdbc42e Add missing monitor/refresh rate members initialization 2017-04-05 21:50:00 +03:00
Lasse Öörni
af6ee8e438 Merge remote-tracking branch 'orefkov/master' 2017-04-05 21:00:08 +03:00
Yao Wei Tjong 姚伟忠
6296c18e92 Minor doc update on how to use the define_resource_dirs() macro. 2017-04-05 23:37:20 +08:00
Yao Wei Tjong 姚伟忠
35138fbc33 Prevent the same resource directory from being installed twice. 
Using parent scope is not good enough when multiple targets referencing a same resource directory are not located inside a same parent scope.
Using internal cache fixes this.
 2017-04-05 23:33:00 +08:00
Yao Wei Tjong 姚伟忠
6aba66ce66 For CI - upgrade to Xcode 8.3. 2017-04-05 18:16:50 +08:00
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