townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

452 Commits

Author SHA1 Message Date
1vanK
9d7dceb2f2 06_SkeletalAnimatin: fix running out bounds, lighting correction 
Fix excessive specular on Kachujin texture
 2016-12-30 13:58:41 +03:00
Lasse Öörni
299dbf803b Squashed commit of the following: 
commit 8b67f0edcb9b588c70df1676bdbfa4853e50c3aa
Author: Lumak <lumak5309@gmail.com>
Date:   Thu Dec 29 10:18:40 2016 -0800

    corrected to stonetiled mat

commit c17d68b1e0ed5435c492a26ed8010c4f4aa708eb
Author: Lumak <lumak5309@gmail.com>
Date:   Thu Dec 29 10:14:20 2016 -0800

    removed proto mat/texture

commit 1c322d19556d7796c4958a920203e5b1c80af843
Author: Lumak <lumak5309@gmail.com>
Date:   Wed Dec 28 12:18:59 2016 -0800

    replaced the Jack with Jill in 06_SkeletalAnimation sample
 2016-12-29 20:39:28 +02:00
Lasse Öörni
fef73ba4c4 Squashed commit of the following: 
commit 06f4d6afab933e32eaf3428dd080766b11a87f82
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 18:31:39 2016 +0200

    Black variant of logo.

commit 8fa11f888de023fcc76f26908e2ea77ebfd3146b
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 17:12:14 2016 +0200

    New logo in Lua samples.

commit 1283e38db1164a1c1e5db7d1042feabf996031fb
Merge: 4062553 4f5a2ea
Author: Lasse Öörni <loorni@gmail.com>
Date:   Sun Dec 18 16:51:04 2016 +0200

    Merge remote-tracking branch 'Modanung/new-logo'

commit 4f5a2ea104feeac12b87d3fb89d116e1866c2513
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 05:36:37 2016 +0100

    Also replaced logo in angelscript samples

commit 7c6e5e90c4dc82705883806e46b0957a44fbc787
Author: Modanung <frode@lindeijer.nl>
Date:   Sun Dec 18 03:34:31 2016 +0100

    Changed logo in samples to fishbone logo
 2016-12-18 18:48:39 +02:00
Lasse Öörni
f65ca809e2 Merge remote-tracking branch '1vanK/master' 2016-12-10 15:22:28 +02:00
1vanK
2a703a5ab1 Add engine parameters const 2016-12-10 08:18:18 +03:00
Yao Wei Tjong 姚伟忠
f1d1b757b8 Change all CMakeLists.txt to use LF for consistency sake. 2016-12-05 22:33:59 +08:00
Yao Wei Tjong 姚伟忠
b2af56a14b Minor bug fixes. 2016-11-20 01:24:10 +08:00
Johnathan Jenkins
d78fc4020f minor typos 2016-10-28 13:07:14 -07:00
Lasse Öörni
20af1aa85f Demonstrate listing the vertex + index buffers to Model so that it can be saved correctly. Lua bindings not added for now due to problem with serializing a vector of object pointers. Closes #1638. 2016-10-10 15:44:31 +03:00
1vanK
bba9766c66 39_CrowdNavigation: animation sync 2016-09-14 11:24:20 +03:00
Lasse Öörni
8bef941082 Fix slowed down navigation crowd agent when node dirtied in E_CROWD_AGENT_NODE_REPOSITION. Send the event only after position has been updated. Check for only rotation changing when node dirtied, and do not update position / reset state in that case. Closes #1548. 2016-08-31 12:41:10 +03:00
Lasse Öörni
b3964e21c5 Demonstrate Z fighting elimination by depth bias in 10_RenderToTexture sample. Closes #1543. 2016-08-30 21:21:10 +03:00
Lasse Öörni
98a3c8d49a Remove Abs() from NinjaSnowWar & CharacterDemo ground contact handling to prove that we can check for normals pointing up to detect ground. 2016-08-17 23:52:13 +03:00
Lasse Öörni
9f3e5e9cbb Squashed commit of the following: 
commit da349be28508316a690086f5f8cec4be80d4a0a9
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:40:50 2016 +0300

    Convert mutant textures to .jpg to conserve repository size.

commit 086bfd662631df30bbad033b8be967b04db44f0b
Merge: 84e5da6 d135d76
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:38:44 2016 +0300

    Merge remote-tracking branch 'Lumak/master'

commit d135d760460e1bc925b1a3ea6a14a9d7ed5e8283
Author: Lumak <lumak5309@gmail.com>
Date:   Tue Aug 16 10:01:53 2016 -0700

    replaced char model w/ mutant model in 18 char demo lua,

commit 9255fd76e5393b636f2c32d33dce99c00caa555a
Author: Lumak <lumak5309@gmail.com>
Date:   Mon Aug 15 16:08:39 2016 -0700

    replaced jack model w/ mutant model in 18 character demo
 2016-08-16 21:45:17 +03:00
Lasse Öörni
0991c8e078 Ensure node's components are properly marked for network update in case node is late added to the scene. Make it impossible for a NetworkState to exist without properly allocated currentValues & previousValues. Fix erroneous comment in C++ version of SceneReplication sample. Code cleanup & minor optimization. Closes #1511. 2016-08-09 22:38:35 +03:00
Yao Wei Tjong 姚伟忠
b99f652892 Minor refactoring on the event profiler subsystem. 2016-08-05 17:43:30 +08:00
Mike3D
ef6284c938 Fixed mouse mode for sample #36 [ci skip] 2016-08-03 08:15:34 +02:00
Lasse Öörni
812afaeb8f Fix PBR material demo to operate similarly on AS, Lua, C++. Remove forcing of alpha to 1 from Zone::SetAmbientColor() & Zone::SetFogColor(). Change "Enable HDR" to "HDR rendering" in editor settings dialog for consistency. 2016-07-29 16:44:57 +03:00
Lasse Öörni
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +03:00
Lasse Öörni
dfd8939840 Squashed commit of the following: 
commit 5de699c5399847dfad99a58323590f88436e1f68
Merge: d80b1d9 97c5fbf
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Sun Jul 24 18:28:50 2016 +0100

    Merge pull request #4 from hdunderscore/tweaks2

    Tweaks2

commit 97c5fbfe515a1c1ae86b059d86694a9f2c053ce6
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Sun Jul 24 22:50:11 2016 +1000

    - Removed inconsistency with roughness input.
    - Switched to a different mip map selection method for the IBL.
    - Extended the angelscript PBR sample to include a slider for ambient HDR scaling.
    - Removed an extra diffuse factor in lighting output.

commit d80b1d9b3c00a04e837324af1546f407311803fd
Merge: 53603fd 7f77574
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Jul 22 23:00:59 2016 +0100

    Merge branch 'pulls/2'

commit 7f775749a9229f5b8f1d313a2c72a88acc001b11
Merge: 53603fd b339da6
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Jul 22 22:57:26 2016 +0100

    Tweaks

    # Conflicts:
    #	bin/CoreData/Shaders/GLSL/Lighting.glsl
    #	bin/CoreData/Shaders/HLSL/Lighting.hlsl
    #	bin/Data/Scenes/PBRExample.xml

commit 53603fd7165fb90c485d6fd85e2d4c41e3e86213
Merge: f88b484 a21746f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Wed Jul 20 22:52:41 2016 +0100

    Merge remote-tracking branch 'origin/master'

commit f88b48441965d5dbcee8667282e879c93bc31577
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Wed Jul 20 22:49:43 2016 +0100

    Fixed Inverse Square falloff and correction mistake with output color

commit a21746f5e2b540e4dae952e181d000dd8e8101f4
Merge: 89688e8 c33f75a
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Wed Jul 20 22:28:17 2016 +0100

    Merge pull request #3 from 1vanK/master

    Modify PBR example

commit c33f75a78369760ace1f817e9c8ed288a0418a30
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Thu Jul 21 00:16:05 2016 +0300

    Labels

commit efa757e0ee39daf4a4e03714828677e79ae5e4e2
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Wed Jul 20 17:14:06 2016 +0300

    Dynamic material in PBR example

commit b339da6fc992e49d1e4139d836654c8ce6befa24
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Thu Jul 21 00:09:47 2016 +1000

    - Adjusted light falloff.
    - Enabled HDR rendering in PBRMaterials.cpp

commit b233da5ccad3c1898a1f459bbc59459be525a16f
Author: 1vanK <1vanK@users.noreply.github.com>
Date:   Wed Jul 20 14:25:59 2016 +0300

    Remove unnecessary texture

commit ede652fcf39135350725c7eda5c6c9324ffb0c0a
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 15:49:27 2016 +1000

    Added missing xml's.

commit fd1b187f09f4478bd32375e4ca13900b6ec59f49
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 15:13:47 2016 +1000

    Minor fix to diffuse ibl calculation.

commit 1cee2d27e8abd69fe6f77d41e2a0d27dcac8624b
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 10:55:58 2016 +1000

    Changed the hdr scaling to be more versatile.

commit 35623b758b1e199116b1ba9594afeb3d1ecef7ba
Author: hdunderscore <hdunderscore@gmail.com>
Date:   Wed Jul 20 09:27:46 2016 +1000

    - Fixed gamma correction
    - Added fake hdr to IBL and skybox which can be controlled via the zone ambient colour alpha channel.

commit 89688e81424eea030e5329cbd9d59b094ee02183
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 21:17:30 2016 +0100

    Renived unlicenced files

commit 70f39b0a40b50f317aef101ce29950185a2ee7e3
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:21:38 2016 +0100

    Removed gamma correction from PBR demo

commit 451f45c4d2ed360179640af31eabdf74b3673c6f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:20:32 2016 +0100

    Added legacy BRDF for GL

commit 87316006297df9dda94178f7ab81f663862553a8
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 14:17:02 2016 +0100

    Added diffuse ibl and legacy features

commit 9f0fb0eaca4a53e49caf65661edfb9d85fe1b880
Merge: 1883a4c 4230e43
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 10:36:08 2016 +0100

    Merge remote-tracking branch 'origin/master'

commit 1883a4c42f228306dd723098869281a7025b5987
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Jul 19 10:34:47 2016 +0100

    Changed model on the demo scene

commit 4230e4328d6ef47808a85f1b231f5116d8b99437
Merge: 900f203 607ab5c
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date:   Tue Jul 19 00:07:17 2016 +0100

    Merge pull request #1 from Modanung/typo-fix

    Changed n to m in PBR example scene

commit 607ab5c414749f3d2dd85f2b7c441525b94a8fa3
Author: Frode Lindeijer <frode@lindeijer.nl>
Date:   Tue Jul 19 00:41:34 2016 +0200

    Changed n to m in PBR example scene

commit 900f20316da833868e6274aa7e7de01502a2a357
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 22:19:17 2016 +0100

    Fixed reverted changes

commit 49cc201a1e0956db82b1103d23b3a4059cacd374
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 21:58:36 2016 +0100

    PBR Rewrite

commit 262e18c71c08a5bade990f6ead0fd356732c38ee
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Mon Jul 18 21:48:28 2016 +0100

    Complete rewrite of PBR

commit b97469b2ab73deca0613d1963500f223a5956bf9
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sun Jul 17 09:49:52 2016 +0100

    Dissabled nolonger needed post processed gamma correction

commit 6e4ec5b4cdaba58678a21b8a90138eb2b8a5e9d4
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sun Jul 17 09:48:53 2016 +0100

    Fixed rendering issue in DirectX

commit fd57ed2bea5caad1fff65e35abfe65b227ddb13a
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:39:48 2016 +0100

    Fixed Spelling errors

commit 3dad639d48aee0d4d3a17ecd8d35f732b796d938
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:35:09 2016 +0100

    Made GGX distrabution physically correct

commit ffda95b2df1e042d8cef611add06989c5a0fd862
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 21:20:20 2016 +0100

    Removed redundent textures

commit 283f389951b0e29a2f3a6b445dfc3cab0e59920c
Merge: 7bbb0f6 ca6d6e5
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 19:34:26 2016 +0100

    Merge branch 'master' of https://github.com/urho3d/Urho3D

commit 7bbb0f68bb1c8f0fa5ccf39475a5997e82c18b62
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 18:57:49 2016 +0100

    PBR Gamma correctoin, and small prefernace changes to the demo scene
 2016-07-25 00:54:21 +03:00
Mike3D
238f09c53d Fixed TileMap2D::PositionToTileIndex() and use it in tile map sample 2016-07-18 13:18:57 +02:00
Yao Wei Tjong 姚伟忠
fd9db884b4 Add template version of UIElement::GetChild() methods. 2016-07-11 19:17:52 +08:00
Yusuf Umar
a9f7703f74 Add update invisible parameter to RibbonTrail and use it on the samples. 2016-06-16 18:09:09 +07:00
Yao Wei Tjong 姚伟忠
239c0265a0 Fix a typo in RibbonTrail's attribute and other minor cleanups. 2016-06-16 13:28:02 +08:00
Lasse Öörni
f6d413aee4 Minor comment and code convention edits. 2016-06-15 21:14:59 +03:00
Yusuf Umar
f9e65027e3 Implementing RibbonTrail 2016-06-15 21:14:58 +03:00
Yao Wei Tjong 姚伟忠
eff1cd46b9 Sort samples list, just for consistency sake. 2016-06-11 20:43:33 +08:00
Yao Wei Tjong 姚伟忠
1243d8bcda Regex replace all the uppercase key bindings with their constants. 2016-06-11 02:56:39 +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
a794f9e59b Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++) 2016-05-30 20:45:13 +03:00
cosmy
b057434bfa Make escape key name consistent between keycode and scancode. 2016-05-27 13:27:53 +02:00
Yao Wei Tjong 姚伟忠
d2fe7b1228 Remove "z" shortcut for console (consistent with scripting samples). 2016-05-25 16:39:50 +08:00
Lasse Öörni
2ea850ff14 Do not compile HttpRequestDemo sample if URHO3D_NETWORK is not defined. Fix HttpRequest class Lua bindings to not inherit Deserializer to avoid crash, instead expose read functions manually like File does. Fix string concatenation in HttpRequestDemo lua code. 2016-05-23 20:37:02 +03:00
cosmy
2b1118528b Simplify sample code. 2016-05-23 17:16:15 +02:00
cosmy
c2128e054e Clean C++ sample and add Lua version. 2016-05-23 14:35:06 +02:00
cosmy
e8d0d60a98 Fix Clang compilation errors. 2016-05-23 14:14:49 +02:00
cosmy
bdb5035eb4 Add C++ Http Request demo sample. 2016-05-23 13:01:04 +02:00
1vanK
d6f5f5d45c Fix gold coin animation 2016-05-11 11:27:29 +03:00
Lasse Öörni
a955725bd0 Add the interpolation mode IM_NONE to ValueAnimation. Add animating UI element to LightAnimation example. Add ResourceRef constructor that takes type & name as strings for easier script bindings. 2016-05-09 22:38:06 +03:00
Lasse Öörni
31e57e01fb Add PBR sample C++ version. 2016-05-01 13:41:18 +03:00
Yao Wei Tjong 姚伟忠
a15abf5068 Avoid hard-coding of the sample list in the build script. 2016-04-27 12:23:35 +08:00
Yao Wei Tjong 姚伟忠
87f408be51 For CI - avoid hard-coding of the sample list in the build script. 
Switch the build output verboseness to normal as the diagnostic mode also does not help to reveal any additional information on the crowd navigation sample when it segfaulted during test.
 2016-04-26 13:25:45 +08:00
Lasse Öörni
44133d00d9 Fix typo. 2016-04-11 00:35:41 +03:00
Lasse Öörni
644eecfa7d Demonstrate defining non-legacy vertex elements in the DynamicGeometry C++ & AngelScript examples. 2016-04-10 15:37:48 +03:00
hdunderscore
467c4bd4e8 - Updated sample mouse mode setup. 
- (Web) Removed some of the exit engine logic.
 2016-03-27 20:01:22 +11:00
hdunderscore
54565005e2 Updated HTML5 behavior of the samples, mouse modes and UI cursor. 
Updates:
- Exposed a new method to determine whether the mouse pointer is confined to window.
- E_MOUSEMODECHANGED now has a new parameter, P_MOUSELOCK, indicating whether the mouse pointer is locked.
- MM_ABSOLUTE now behaves more closely to the desktop equivalent (web)
- Changed some samples to use different mouse movement methods as test cases.
- Input class: suppressNextMouseMove_ now suppresses all movements within the tick.
- Added script bindings for the Input class changes.
- On Web platform, removed event polling and instead use event callbacks, allowing pointer-lock requests to occur in browser events.

Bug fixes:
- Fixed mouse jumps on entering and exiting pointer-lock (web)
- Fixed a bug that caused the UI cursor and OS cursor to fall out of sync (web)
- Fixed a bug that could allow pointer-lock to be acquired after a different mouse mode was requested. (web)
- Prevent most samples from exiting on Web platform
- Reverted previous fix to web platform touch events, as upstream SDL has corrected the corresponding bug.
 2016-03-23 01:52:12 +11:00
rikorin
51c7a94a04 Type mismatch in vehicle sample code 2016-03-21 13:18:42 +05:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Web platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
ccf6648eb3 Utilize new SDLActivity's get arguments feature. 2016-03-16 01:42:01 +08:00
Lasse Öörni
d9a295a595 Re-enable the unsigned/signed mismatch warning. Code cleanup. 2016-03-06 15:10:34 +02:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016. 
[ccache clear]
 2016-01-26 13:55:03 +00:00
Ivan K
68668266d2 Add tags to UIElement 2016-01-21 21:42:17 +02:00
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08:00
Lasse Öörni
6a3bbb8aab Fix D3D11 constant buffers for VSM. Fix editor shadow mode selection. Fix script API for new shadow modes. Fix debughud for new shadow modes. Edit documentation to refer to new shadow modes. Added contributor credit. Some code convention edits, e.g. VSM instead of Vsm. Dump new NinjaSnowWarShaders.xml file. 2015-12-18 14:22:24 +02:00
Xavier Maupeu
dbcfc9721e merge VSM shadow 2015-12-17 23:04:48 +01:00
Yao Wei Tjong 姚伟忠
f471dd66dd Refactor installation structure for Windows platform. 
Attempt to reenable the try_compile logic to verify if the found Urho3D
library is ABI-compatible with the chosen compiler toolchain.
 2015-12-16 22:21:24 +08:00
Xavier Maupeu
362242bd3b update script API for ShadowQuality 2015-11-26 11:27:20 +01:00
Lasse Öörni
29e62526eb Added event for sound playback finished. Deprecate SoundSource::SetAutoRemove() and change samples + NinjaSnowWar to not use it. Fix network replication of SoundSource to work with repeated playback on the same source. 2015-11-25 22:50:19 +02:00
Lasse Öörni
8463b48e96 Remove SplitMode enum in favor of a bool to simplify script binding. Reverse the default behavior to not return empty strings to ensure correctness of existing code. Fix resource prefix path list to not require a space. Fix ResourceRefList deserialization. Closes #1014. 2015-11-08 14:14:46 +02:00
Yao Wei Tjong 姚伟忠
587344af8a Minor cleanup to simplify the override condition for sample code. 2015-11-04 22:26:36 +08:00
Yao Wei Tjong 姚伟忠
f47c04dcee Minor fix on code comment. [ci skip] 2015-11-04 00:16:27 +08:00
Yao Wei Tjong 姚伟忠
8c8e2a97b5 Allow -pp and URHO3D_PREFIX_PATH to override the sample default paths. 
This is useful for user to try out the apps with alternate asset directories.
 2015-11-04 00:06:34 +08:00
Yao Wei Tjong 姚伟忠
22bd3de807 Refactor resource prefix path parameter to accept a list of paths. 
Close #1000.
 2015-11-03 17:46:56 +08:00
Lasse Öörni
af985e0df1 Alternative O key to create obstacles in the navigation demos. Closes #995. 2015-10-31 22:01:04 +02:00
Lasse Öörni
385493f39a Explain that touch input is needed for multiple dragging. Closes #997. 2015-10-31 16:48:25 +02:00
Yao Wei Tjong 姚伟忠
c0d8415ae8 Fix the spawn button label in CrowdNavigation demo. 
[ci skip]
 2015-10-31 14:41:26 +08:00
Lasse Öörni
94a7f4ef63 Make UI element layouting not modify the user assigned minSize. Instead keep record of the min.size required by layout separately. Fix HelloGUI sample to the new behavior. Closes #955. 2015-10-29 17:22:53 +02:00
Lasse Öörni
b616aa6272 Merge remote-tracking branch '1vanK/master' 
Conflicts:
	Source/Urho3D/Engine/DebugHud.cpp
	Source/Urho3D/Engine/Engine.cpp
 2015-10-23 22:27:39 +03:00
JSandusky
8e39692ef3 Show "Memory usage" DebugHud in all samples (F3 key) 2015-10-22 19:49:49 -04:00
Ivan K
ecafb47f73 LOGRAW -> URHO3D_LOGRAW 2015-10-23 00:20:52 +04:00
Ivan K
ad2eb74d83 LOGERROR -> URHO3D_LOGERROR 2015-10-23 00:17:49 +04:00
Ivan K
3a7e7f058e LOGWARNING -> URHO3D_LOGWARNING 2015-10-23 00:06:38 +04:00
Ivan K
db15f0358e PROFILE -> URHO3D_PROFILE 2015-10-21 23:46:50 +04:00
Ivan K
31f3c9ab65 DEFINE_APPLICATION_MAIN -> URHO3D_DEFINE_APPLICATION_MAIN 2015-10-21 23:08:28 +04:00
Ivan K
431e29d2cd ATTRIBUTE -> URHO3D_ATTRIBUTE 2015-10-21 22:14:03 +04:00
Ivan K
4bcbae61fe HANDLER -> URHO3D_HANDLER 2015-10-21 21:49:02 +04:00
Ivan K
f02cd63437 OBJECT -> URHO3D_OBJECT 2015-10-21 11:12:45 +04:00
Lasse Öörni
3988f8873e Merge remote-tracking branch 'juj/unsynchronized_jacks' 2015-10-12 11:44:26 +03:00
Jukka Jylänki
bf9111b862 Make Jacks not walk in synchronized lockstep timing in 06_SkeletalAnimation sample. 2015-10-11 19:05:51 +03:00
aster2013
6bd1d77634 Add baseTypeName argument to OBJECT macro. 2015-10-11 22:17:55 +08:00
Yao Wei Tjong 姚伟忠
01cae9de6a Switch off the sound support for most of the sample apps by default. 
Close #924.
[ci package]
 2015-10-06 16:58:02 +08:00
Lasse Öörni
65d36e4db2 Fix crash / null exception in CharacterDemo which would result if the character node did not exist after loading the scene. 2015-09-30 16:34:24 +03:00
Yao Wei Tjong 姚伟忠
8652de217d Rename Source/Urho3D/Script to Source/Urho3D/AngelScript. 2015-09-27 16:06:49 +08:00
Lasse Öörni
69f4a405b7 Removed mention of missing functionality from CrowdNavigation help text. Fixed double -> float conversion warning. 2015-09-19 13:29:37 +03:00
aster2013
fc2a3805ea Remove line end spaces.[ci skip] 2015-09-07 12:22:29 +08:00
aster2013
5d50ad4b71 Change SetAnimtion function in AnimatedSprite2D. 2015-09-06 20:37:15 +08:00
aster2013
5bcb12afa2 Fix comment. 2015-09-05 22:28:39 +08:00
aster2013
0cded698e4 Merge from spine-spriter branch. 
Main changes:
     Make spriter as a lib
     Enable spine support in AnimatedSprite2D and Animation2D.
 2015-09-05 22:23:35 +08:00
Yao Wei Tjong 姚伟忠
c2471a240a Reorganize includes for Samples and Extras. 
Since the URHO3D_PCH build option is made available to support non-PCH build, our build system does not rely on precompiled header to include the Urho3D.h export header anymore. The export header is auto-included by one of Urho3D headers when it is required using the right format with the help of URHO3D_IS_BUILDING compiler define. As such, there is no need to explicitly include Urho3D.h in external project too. Sorry for the flip-flop.
 2015-08-27 18:07:20 +08:00
aster2013
349a3ee981 Sort include file in samples. 2015-08-27 13:54:54 +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 姚伟忠
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 姚伟忠
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
Yao Wei Tjong 姚伟忠
842de2fe48 Exposed the database subsystem API to scripting. 
Add AngelScript version of the database demo.
Add Lua versio nof the database demo. WIP.
 2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
33145bf18f Use numCols to determine whether a result object impl has resultset. 
Only supports one resultset per execution at the moment.
Enhance db sample demo to accept connectiong string setting to connect to different database during runtime.
[skip ci]
 2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
f420b14ad2 Make URHO3D_DATABASE_ODBC suppresses URHO3D_DATABASE_SQLITE. 
Correct a typo in the database demo.
[ci skip]
 2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
0e2af9c788 Initial ODBC API support. 
Enhance db demo to work with ODBC database connectioon string.
 2015-08-10 01:51:25 +08:00
Yao Wei Tjong 姚伟忠
7d6f0ffeab Fix Database subsystem on Emscripten build. 
[ci only: Emscripten]
 2015-08-10 01:51:25 +08:00
Yao Wei Tjong 姚伟忠
560ef3bb37 Add Database subsystem. Add new build option to enable it. 
Initial C++ sample database demo using execute immediate mode.
 2015-08-10 01:51:25 +08:00
Ivan K
d540f79eec Localization: fixes, adding comments, reworking samples, partial russification of editor 2015-07-19 16:07:24 +04:00
Ivan K
1d845712c8 Internationalization: initial commit 
Localization
 2015-07-18 14:43:51 +04:00
nemerle
8bad584cb4 Match project's coding conventions and expose the new functionality to angelscript and lua 
Remove debugging code from Decals example.
 2015-06-15 19:06:05 +02:00
nemerle
16006239c1 Add support for retrieving UV coordinates of successful Ray query. 
Conflicts:
	Source/Samples/08_Decals/Decals.cpp
	Source/Urho3D/Graphics/Geometry.cpp
	Source/Urho3D/Graphics/Geometry.h
	Source/Urho3D/Graphics/OctreeQuery.h
	Source/Urho3D/Graphics/StaticModel.cpp
	Source/Urho3D/Math/Ray.cpp
	Source/Urho3D/Math/Ray.h
 2015-06-15 17:05:50 +02:00
Yao Wei Tjong 姚伟忠
88d86548a4 Further minor clean up the CrowdAgent class. 
Revise the sample so Jack walk and turn more naturally.
 2015-05-28 17:52:12 +08:00
Yao Wei Tjong 姚伟忠
6b72c4412a Minor code clean up and bug fixes for DetourCrowd implementation. 
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
 2015-05-27 21:51:10 +08:00
Mike3D
e166e7a84d Added moving obstacles and teleportation to sample 39. Also various behavior tweaks and ground texture modified to break monotony and discriminate with sample 15. If something doesn't appeal it can be reverted. 
Also set default mask and areaID at OffMeshConnection initialization.
 2015-05-23 09:27:39 +02:00
Mike3D
7f3a6ef86b Added off-mesh connections to sample 39 2015-05-20 10:56:32 +02:00
Mike3D
cca861f6d3 Simplified sample 39 using the crowd manager 2015-05-17 10:15:41 +02:00
Lasse Öörni
5b41352680 Minor whitespace and code convention edits. 2015-05-12 15:37:27 +03:00
JSandusky
ca7a6af1f3 CrowdAgent state handling 
- CrowdAgentStateChanged event includes Node and Agent parameters
- CrowdAgentFailure event for target/agent-state failures
- GetAreaCost in NavigationMesh, script bindings updated
- Fixed error spawning Jack nodes on top of boxes in Angelscript sample
- DebugRendering for DynamicNavigationMesh layers
- Rename all references to AreaType as AreaID
- CrowdAgent angelscript enum bindings made consistent
- Include simple example handling of CrowdAgentFailure for faulty
initial state (sides of boxes) in all samples
- Consistent values in samples (box/mushroom counts)
- Completed "todo" for investigating rcFilterLedgeSpans in
DynamicNavigationMesh
 2015-05-12 02:29:32 -04:00
Yao Wei Tjong 姚伟忠
fb84bcf179 For Travis CI - tune down email notifications frequency. 
Add checkpoint for Emscripten CI build and use it to determine whether to skip make test and/or scaffolding test when running short of time.

For Travis CI - perform the full CI jobs for topic branches and PRs.

For Travis CI - use custom data in .travis.yml for excluding samples.
 2015-05-08 18:39:14 +08:00
Mike3D
581d1b550b Do not hardcode obstacle radius 2015-05-07 17:20:05 +02:00
Yao Wei Tjong 姚伟忠
252206a207 Decouple Physics subsystem from DetourCrowd implementation. 
Also minor code clean up (dot the i's and cross the t's).
 2015-05-07 16:52:18 +08:00
Lasse Öörni
42c352f2ba Tabs to spaces. Change NavArea Bounds to BoundingBox to match Urho convention elsewhere. Added NavArea component Lua binding. 2015-05-06 11:56:12 +03:00
JSandusky
567a29d74e Implementation of DetourCrowd and DetourTileCache 
Added Components:
- DynamicNavigationMesh (uses DetourTileCache)
- Obstacle (interacts with DynamicNavigationMesh)
- DetourCrowdManager (uses DetourCrowd for crowd control)
- CrowdAgent (interacts with DetourCrowdManager)
- NavArea (marks area types)

Changes:
- Refactor NavigationMesh build process
- Addition of cylinder debug rendering
- Exposed Area Type Costs in navigation

CrowdNavigation sample for Lua, Angelscript, and C++ using
DynamicNavigationMesh, Obstacle, CrowdAgent, and DetourCrowdManager
components.
 2015-05-04 22:14:00 -04:00
Yao Wei Tjong 姚伟忠
d2ea0ca934 Finetune the default test timeout value for Emscripten platform. 
We have a time constraint on Travis CI side for all our CI builds and tests. Default value of 10 for Emscripten and 5 for native platform is also inline with Emscripten's claim that asm.js is about 50% slower than native speed.
 2015-03-14 12:46:15 +08:00
Yao Wei Tjong 姚伟忠
0fe597223f Add initial support for integration tests on Emscripten platform. 
At the moment the 'make test' cannot be run non-interactively yet on Linux host and Mac OS X host systems due to what-could-be a bug in 'emrun' script. The issue with 'emrun' has been reported to upstream (https://github.com/kripken/emscripten/issues/3234).
 2015-03-07 12:00:47 +08:00
Yao Wei Tjong 姚伟忠
4d34d0a626 Add new Emscripten build option for creating shared data file. 2015-03-03 23:32:27 +08:00
Yao Wei Tjong 姚伟忠
02572a9ec5 Add generic support for embedding and loading files for Emscripten. 
Via the following source file property "EMCC_OPTION". The supported property values are: js-library, pre-js, post-js, embed-file, preload-file, shell-file. The files are added as link dependency so a relink will automatically occur when they are modified (have newer timestamp than target).
 2015-03-03 01:16:40 +08:00
Lasse Öörni
b6ea033ce3 Enable CharacterDemo & VehicleDemo also without networking. Update documentation. 2015-02-14 22:16:39 +02:00
Yao Wei Tjong 姚伟忠
24e70ecd60 For Travis-CI - reduce number of samples in Emscripten build. 
Also remove CI build for shared lib type. It is anyway just an emulation as Emscripten does not support dynamic library (yet) and our earlier issue with emar for static lib type has been fully resolved. Test [ci package] for Emscripten.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
6763207787 Complet the rebase to master branch. 2015-02-13 21:23:05 +08:00
aster2013
83e1fbebe3 Remove WeakPtr<LuaFunction> in LuaIntegration sample; 
Convert tab to spaces in ParticleEffect2D.
 2015-02-05 14:01:17 +08:00
Yao Wei Tjong 姚伟忠
cfff44873f Bump missed out files. [ci skip] 
$ for f in `git grep -l '2008-2014 the Urho3D project'`; do perl -pi -e 's/2008-2014 the Urho3D project/2008-2015 the Urho3D project/g' $f; done
 2015-02-01 08:16:05 +08:00
Lasse Öörni
bb2ebf7568 Bump copyright to 2015. 2015-01-31 21:03:53 +02:00
Yao Wei Tjong 姚伟忠
ed214bbeb3 Avoid the include dirs hack for finding the Urho3D.h header. 
It is now a library user own's responsibility to include the Urho3D.h in their source code. Or to include it as part of their own precompiled header similar to what Urho3D project has done.
 2015-01-20 18:15:29 +08:00
Yao Wei Tjong 姚伟忠
35307869ee Clean up to remove unused CMake variables. 
LIBS is now defunct. No more dual purpose usage.
INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS.
LINK_LIBS_ONLY is renamed to LIBS.
 2015-01-07 21:51:00 +08:00
Yao Wei Tjong 姚伟忠
359efb2d37 Move the DebugNew.h from Urho3D/Container subdir to Urho3D subdir. 2015-01-05 22:31:32 +08:00
Mike3D
7f805b8645 Centered Imp Spriter anim on the Y axis and removed position offset in samples. 2015-01-05 14:32:12 +01:00
Mike3D
be94437b69 Simplified sample 15 2015-01-05 14:21:37 +01:00
Yao Wei Tjong 姚伟忠
65aa095a0c Refactor newly added sample app to use Urho3D SDK include path. 2015-01-04 22:49:18 +08:00
Yao Wei Tjong 姚伟忠
b51e419c88 Change impl. file to include the header file from corresponding subdir. 
Change header file to use relative pathspec when including other files.
 2015-01-04 22:40:40 +08:00
Yao Wei Tjong 姚伟忠
4feb135281 Clean up SDK include dirs. Refactor FindUrho3D CMake module. 
For Travis CI - add new steps to install the Urho3D SDK and to reference Urho3D library from the installed SDK.
 2015-01-04 22:32:41 +08:00
Lasse Öörni
50e2493b97 Added example of loading scene & UI content. Closes #583. 2014-12-29 22:33:15 +02:00
Mike3D
598fab2371 Use GetPosition2D() when appropriate. 2014-12-27 11:37:25 +01:00
Mike3D
c676f13d8b Removed Spriter position offset (no longer needed) 2014-12-27 11:14:56 +01:00
Mike3D
08813e8e4b Ensure full display of Urho2D samples whatever the user's resolution 2014-12-23 07:54:15 +01:00
Yao Wei Tjong 姚伟忠
9855bfe5fb Apply the attribute changes after animating its values. 
Fixes #554.
 2014-12-04 12:56:22 +08:00
aster2013
4655ee1ee4 Submit code in LuaScript samples. 2014-11-22 16:23:17 +08:00
aster2013
c7e248b13a Enable mouse visible in UIDrag sample. 2014-11-21 22:13:22 +08:00
Lasse Öörni
b325ba5195 Support excluding 2D functionality from the build (CMake option URHO3D_URHO2D=0). Removed empty scene creation from the UIDrag example. Make compiling Civetweb conditional of URHO3D_NETWORK. Exclude samples depending on the Controls structure when URHO3D_NETWORK is disabled. 2014-11-17 21:00:02 +02:00
Lasse Öörni
16c05ee6cf Fix occlusion rendering to work with reverse triangle winding. Fix MultipleViewports C++ example using depth test in debug geometry. 2014-11-17 18:04:32 +02:00
Lasse Öörni
3969b69b0d Refactor material shader parameter animations so that they happen in response to update events, the same as component/node attribute animations. This fixes material animations depending on visibility and therefore possibly going out of sync from other updates. Add possibility to associate material with scene to make it use the scene attribute update event instead of the global update event. 2014-11-17 14:00:45 +02:00
Lasse Öörni
50eb143319 Fix consistency in touch hover touch ID. Fix returning touch IDs as available. When resetting touches, reset the touch ID mapping also. In UIDrag example, show the actual touch ID's instead of indices, to verify that the ID's stay consistent. Fix UIDrag Lua example erroneously modifying the TouchState's position. 2014-11-15 18:42:28 +02:00
hdunderscore
3d58fc94c9 Updated the UI Drag sample descriptions. 2014-11-09 18:55:37 +11:00
hdunderscore
ad6081192b Added Lua and AngelScript versions of Sample. 
Added UIElement::GetDragButtonCount / UIElement::GetDragButtonCombo bindings to AngelScript.
 2014-11-04 16:56:01 +11:00
hdunderscore
13412bc68f A sample showing how to use UI drag features (drag begin/move/end/cancel and how to use most of the event data), and it can be used to demonstrate multi-touch drag support on touch-enabled devices. 2014-11-02 15:29:04 +11:00
Lasse Öörni
807bd28a9d Add URHO3D_NETWORK CMake parameter to control whether networking support is built. 2014-10-07 19:33:33 +03:00