townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,869 Commits 3 Branches 3 Tags 168 MiB
cc-2
Commit Graph

9869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silverkorn
792531552f Fix missing escape characters for the Zerobrane Studio API. 2015-08-20 22:11:57 -04:00
aster2013
d3247fccf5 Minor fixed. 2015-08-21 00:30:49 +08:00
aster2013
c0014f40bb Accroding the discuss on forum by Lasse and other users and refer to the json code in Lasse's Turso3D engine, rewrite JSONFile and JSONValue class, make it looks like JSON. 2015-08-21 00:12:42 +08:00
Lasse Öörni
999ccb9bc1 Added contributor credit. 2015-08-20 11:38:58 +03:00
Lasse Öörni
7b312275a2 Merge remote-tracking branch 'bjorn/fix-objecttype' 2015-08-20 10:59:45 +03:00
Lasse Öörni
b456f369c5 Merge remote-tracking branch 'bjorn/fix-typo' 2015-08-20 10:59:39 +03:00
Yao Wei Tjong 姚伟忠
f7a30b8306 Add back the logic to first check if keybinding length is correct. 2015-08-20 07:51:17 +08:00
Thorbjørn Lindeijer
094d146c3c TmxFile2D: Fix determination of object type 
TmxObjectGroup2D::Load was using the presence of the "width" and
"height" attributes for deciding whether an object was a rectangle,
ellipse or something else. This is wrong, and the approach breaks for
maps saved in more recent versions of Tiled. This is because the width
and height are only saved when they differ from the default (0), and
because the width and height are now also used to store the size of tile
objects.

So for maps saved with Tiled >= 0.12, this change:

* Fixes identification of rectangle and ellipse objects with 0 width and
  height (which was leading to the entire map failing to load).
* Fixes identification of tile objects.
 2015-08-19 21:45:22 +02:00
Thorbjørn Lindeijer
64afa327de Fix a typo: worlsScaleX -> worldScaleX 2015-08-19 21:26:47 +02:00
Yao Wei Tjong 姚伟忠
ded284e6c3 Fix a copy pasta error. 
Related to commit 530950ed7c.
 2015-08-20 00:41:05 +08:00
Lasse Öörni
7499e19998 Prevent creation of multiple value childs to XMLElement, when SetValue() is called several times. 2015-08-19 18:51:21 +03:00
Yao Wei Tjong 姚伟忠
530950ed7c Store keymap bindings for hat using an IntRect instead of String. 
Fix #847.
 2015-08-19 23:40:37 +08:00
Lasse Öörni
0e3c778f34 Fix using null handle when updating temporary component state. Closes #848. 2015-08-19 18:33:22 +03:00
Lasse Öörni
d4696f92a0 Make sure adding & deleting RigidBody2D fixtures doesn't reset the mass when not wanted (useFixtureMass = false). Fixed some mistaken if statement logic, and improved some RigidBody2D comments. Note that when useFixtureMass = false, you must set nonzero inertia to get rotation. Closes #844. 2015-08-19 18:19:31 +03:00
Yao Wei Tjong 姚伟忠
55635bdf3a Replace friend func with explicit template specialization for Get(). 
Credit to Aster Jian.
 2015-08-19 22:11:27 +08:00
Lasse Öörni
44acf54118 Make sure the lowest bone influences are dropped if too many. 2015-08-18 21:58:24 +03:00
Lasse Öörni
b631612ff7 Force normalization of vertex weights in AssetImporter. More than 4 weights is no longer a fatal error, instead any more than that are dropped and a warning is logged. 2015-08-18 19:27:25 +03:00
Yao Wei Tjong 姚伟忠
102e8862bd Avoid repetition by accessing Variant::value directly via friend func. 2015-08-19 00:13:51 +08:00
urho3d-travis-ci
5c4562ba67 Travis CI: API documentation update at 2015-08-18 09:26:22 UTC. 
[ci package]

Commit: b202aa6ee7

Message: Minor typo correction on Lua scripting documentation page.
 2015-08-18 09:26:22 +00:00
Yao Wei Tjong 姚伟忠
b202aa6ee7 Minor typo correction on Lua scripting documentation page. 2015-08-18 17:12:37 +08:00
Yao Wei Tjong 姚伟忠
4c7f8664b6 Further improve Lua binding for Variant and VariantMap classes. 
- VariantMap can be indexed by a StringHash object directly.
- Bind a generic Get() method for Variant class to automatically "unbox" the stored object and assign it to a type less Lua object.
- Prevent Lua VM crashes when invalid type name is being passed when calling GetVoidPtr() and GetPtr().
 2015-08-18 17:04:55 +08:00
Lasse Öörni
0f0a73c9f6 Fallback when crossproduct in Quaternion::FromLookRotation() becomes zero. Fixes #846. 2015-08-17 18:16:00 +03:00
Lasse Öörni
adc04560ce Added warning for infinite PhysicsWorld raycast. 2015-08-17 11:50:14 +03:00
Yao Wei Tjong 姚伟忠
1cc09cb704 For Coverity Scan - check in the failed model file anyway. 
[ci skip]
 2015-08-17 12:01:46 +08:00
Yao Wei Tjong 姚伟忠
0e031852d1 Suppress most of the false positive on out-of-bound access. 
The affect of this change can only be checked after the next Coverity Scan run on this Thursday.
 2015-08-16 16:44:19 +08:00
Yao Wei Tjong 姚伟忠
ff501b39cc Fix CID 105884 (UNINIT_CTOR) - initialize Renderer2D::viewMask_. 2015-08-16 16:44:19 +08:00
urho3d-travis-ci
002d5a2688 Travis CI: API documentation update at 2015-08-16 07:57:58 UTC. 
[ci package]

Commit: 69dd312d54

Message: Reformat and reorganize include for Navigation sub-library.
 2015-08-16 07:57:58 +00:00
Yao Wei Tjong 姚伟忠
69dd312d54 Reformat and reorganize include for Navigation sub-library. 2015-08-16 15:43:13 +08:00
Yao Wei Tjong 姚伟忠
ac0a712f0b Refactor to rename 'filter type' to 'query filter type'. 
Minor clean up on the NavBuildData class.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
a58d855e60 Do not assume the location of the NavigationMesh component. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
27cc9c4277 Add filter and obstacle avoidance type attribute to CrowdManager class. 
Enhance Editor to have functionality to edit the CrowdManager's filter and obstacle avoidance type attributes.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
b7d03abfe1 Add navigation mesh id attribute to CrowdManager class. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
c9bc4cbae3 Add new event for crowd agent formation. 
Add convenient methods for querying point, path, raycast, etc using crowd's extent and filter type configuration.
 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
549b6fd8be Add crowd update callback support. Remove redundant vectors. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
2c3033d62a Limit interface to use only crowd agent's parameters and public APIs. 2015-08-16 15:43:12 +08:00
urho3d-travis-ci
1cd8ca0cd7 Travis CI: API documentation update at 2015-08-15 10:33:47 UTC. 
[ci package]

Commit: 7f4b115744

Message: Make Drawable2D respect viewmask in rendering & raycast. Added viewmask attribute to Drawable2D's. Added proper category to 2D constraints to allow adding in editor. Closes #843.
 2015-08-15 10:33:47 +00:00
Lasse Öörni
7f4b115744 Make Drawable2D respect viewmask in rendering & raycast. Added viewmask attribute to Drawable2D's. Added proper category to 2D constraints to allow adding in editor. Closes #843. 2015-08-15 13:23:37 +03:00
Lasse Öörni
4f2a35eeb7 Merge remote-tracking branch 'cosmy1/master' 2015-08-15 12:45:11 +03:00
Yao Wei Tjong 姚伟忠
373d989d53 For Travis CI - keep the backup logic simple and stupid. 
Related to commit 9d1a66d108
[ci skip]
 2015-08-15 11:18:06 +08:00
Lasse Öörni
70b871ebfa Code convention edits. Removed unused variable. Make debug icons use Basic shader for no fog. Do not render debug icons to camera preview viewport. Fixed Basic shader with VERTEXCOLOR define on D3D11. 2015-08-14 23:09:53 +03:00
Lasse Öörni
54649e7bb0 Merge remote-tracking branch 'monkeyfirst/debug-component-icons' 2015-08-14 22:25:04 +03:00
cosmy
22955e8ef5 Italian localization 
Added Italian language to the editor.
 2015-08-14 21:15:27 +02:00
Lasse Öörni
c24d709ee1 Use a free area index parameter instead of IntRect in AreaAllocator::SplitRect() to make it clear that the freeAreas_ is being manipulated inside the function. 2015-08-14 21:16:39 +03:00
Lasse Öörni
c3427a6dd5 Merge remote-tracking branch 'cosmy1/master' 2015-08-14 20:41:38 +03:00
Lasse Öörni
cc3aaddb57 Merge remote-tracking branch '1vanK/master' 2015-08-14 20:22:43 +03:00
Yao Wei Tjong 姚伟忠
f96e445cf4 For Travis CI - using relpath to backup & only restore if backup exist. 
[ci only: Android] [ccache clear]
 2015-08-15 00:11:10 +08:00
Yao Wei Tjong 姚伟忠
9d1a66d108 For Travis CI - when using cache store, backup .git before clearing. 
Remove out-of-place C++ header file.
[ci only: Android] [ccache clear]
 2015-08-14 23:47:18 +08:00
Ivan K
b63167ebd8 fix add RigidBody2D after CollisionShape2D 2015-08-14 18:34:41 +04:00
cosmy
4f1c071452 Const references 
Fixed some parameters wrongly passed by value
 2015-08-14 15:10:20 +02:00
urho3d-travis-ci
ab2776e7d3 Travis CI: API documentation update at 2015-08-14 10:55:47 UTC. 
[ci package]

Commit: 9e331d04d4

Message: Ensure correct 0,1,2 order in the RigidBody2D body type enum for serialization. Closes #837.
 2015-08-14 10:55:47 +00:00