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
Lumak
dbd6465169 added assetimporter feature to suppress $fbx nodes 2016-08-22 07:34:43 -07:00
Lumak
1a266d6b89 Merge remote-tracking branch 'upstream/master' 2016-08-22 07:11:45 -07:00
Lasse Öörni
87ec2f39e1 Sync credits additions to README.md. 2016-08-21 21:12:58 +03:00
Lasse Öörni
12da9da22a Add contributor credit. 2016-08-21 18:24:16 +03:00
Scellow
3ba1c8023b Make LineEdit text and cursor to be always vertucaly centered 
I believe that it is how it should be by default, it is not a MultiLineEdit so it should be centered Vertically

http://i.imgur.com/qjAYO0f.png
 2016-08-21 13:39:38 +02:00
Lasse Öörni
31d8082107 Added PBR related assets & Mutant credit information to the credits page. 2016-08-21 14:10:23 +03:00
Yao Wei Tjong 姚伟忠
918c965c82 Fix FindUrho3D.cmake module to consider MinGW as multilib compiler. 
Fix #1527.
 2016-08-21 02:31:53 +08:00
Lumak
910c14654e more mutant anims 
-renamed Jump1 anim as JumpStop and changed Jump1 to jump-to-fall
 2016-08-20 19:12:42 +03:00
urho3d-travis-ci
2ef87e27b6 Travis CI: API documentation update at 2016-08-20 15:46:10 UTC. 
[ci package]

Commit: bef8df21bb

Message: Support defining neighbor terrains to avoid LOD level discontinuities at the edges.
 2016-08-20 15:46:10 +00:00
Lasse Öörni
bef8df21bb Support defining neighbor terrains to avoid LOD level discontinuities at the edges. 2016-08-20 18:33:49 +03:00
Yao Wei Tjong 姚伟忠
11d3b69a2a Make URHO3D_64BIT build option applicable for MinGW compiler toolchain. 
Fix #1525.
 2016-08-20 18:52:44 +08:00
Lumak
5b913910f1 more mutant anims 
-renamed Jump1 anim as JumpStop and changed Jump1 to jump-to-fall
 2016-08-19 14:26:42 -07: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
d3cc0118e8 Handle flipping of normals in collision event sending if body pointers were swapped. Do not discard contact results from the "other" manifold, rather concatenate them into the same collision event. Thanks to Enhex for highlighting the issue. 2016-08-17 23:45:11 +03:00
Yao Wei Tjong 姚伟忠
ecfa732d52 Workaround GCC issue producing shared lib containing undefined symbol. 
Close #1519.
 2016-08-17 16:58:57 +08: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
urho3d-travis-ci
84e5da6155 Travis CI: API documentation update at 2016-08-16 17:41:26 UTC. 
[ci package]

Commit: d2abcc89a6

Message: Add brief documentation section on physical light values.
 2016-08-16 17:41:26 +00:00
Lasse Öörni
d2abcc89a6 Add brief documentation section on physical light values. 2016-08-16 20:31:06 +03:00
Lasse Öörni
d839b2afb8 Minor attribute order and name tweak for the editor. 2016-08-16 19:57:44 +03:00
Lasse Öörni
291b33df99 Squashed commit of the following: 
commit c2f7ab8735bed357555bed7a901f02372cdd5be0
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Aug 16 13:46:34 2016 +0100

    Physical based light values

commit 60f87b92a85635c20200d1bff16432e6f4a01e7c
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Tue Aug 16 10:50:45 2016 +0100

    removed unused share code and fixes spacing

commit 04a6961576ba1034d32b1abcf5cd2dab6599e9d4
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Aug 13 15:47:19 2016 +0100

    cleaned up naming a little

commit 7742eebcb51506c338c7bc93dd9fe683ca7c7293
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Aug 13 15:43:32 2016 +0100

    Made light temperature calculate outside of the shaders, and optional

commit ff784e3af0a23838ac932a1c54ca508687f1ca78
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Aug 12 22:40:06 2016 +0100

    Added AS binding

commit d96634a5af41a230d481f13aaed444bbeaa285bf
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Fri Aug 12 22:25:17 2016 +0100

    Added light temputure
 2016-08-16 19:43:27 +03:00
urho3d-travis-ci
6b4825d798 Travis CI: API documentation update at 2016-08-16 11:54:58 UTC. 
[ci package]

Commit: 5ce39a2955

Message: Support setting a custom size for the UI root element (UI::SetCustomSize()) instead of always auto-resizing according to window size. When renderui renderpath command is used, use the current viewport size for UI rendering projection matrix to avoid distortion. If UI root element is smaller than the screen, apply wrapping in GetElementAt(), with the assumption that a copy is being rendered next to it. Related to #1514.
 2016-08-16 11:54:58 +00:00
Lasse Öörni
5ce39a2955 Support setting a custom size for the UI root element (UI::SetCustomSize()) instead of always auto-resizing according to window size. When "renderui" renderpath command is used, use the current viewport size for UI rendering projection matrix to avoid distortion. If UI root element is smaller than the screen, apply wrapping in GetElementAt(), with the assumption that a copy is being rendered next to it. Related to #1514. 2016-08-16 14:43:27 +03:00
Lasse Öörni
9bbec4b797 Explain why normal offset is not saved for materials. Closes #1518. 2016-08-14 16:22:53 +03:00
Lasse Öörni
7b5da6669f Skip adding a deferred light volume batch when the light has low 8 bits of lightmask cleared; it would not have effect due to the stencil test. Skip shadow map render when there are no forward & deferred batches using it. 2016-08-13 22:56:48 +03:00
Yao Wei Tjong 姚伟忠
372844cce3 For CI - skip uninstalling brew-cask step for now. 
The uninstalling step suddenly stop working today, probably due to a system upgrade on Travis-CI side. Need to further investigate what went wrong. Hopefully by skipping this step the VM still has enough free disk space for packaging build on OSX CI.
[skip appveyor] [ci only: OSX]
 2016-08-14 00:25:00 +08:00
Lasse Öörni
9cb40e239f Minor additions / changes to the UI documentation page. 2016-08-13 19:23:47 +03:00
urho3d-travis-ci
4e6d9fb4f9 Travis CI: API documentation update at 2016-08-13 13:53:42 UTC. 
[ci package]

Commit: fa7db658bc

Message: Start porting notes section from 1.6 to current master.
 2016-08-13 13:53:42 +00:00
Lasse Öörni
fa7db658bc Start porting notes section from 1.6 to current master. 2016-08-13 16:40:41 +03:00
Lasse Öörni
2c8ed38a65 Capitalize CrowdAgent enum attributes for consistency with other components. Loading is case-insensitive so this does not break existing scenes. 2016-08-13 16:26:20 +03:00
Lasse Öörni
3fe5024cf7 Remove deprecated autoRemove bool from SoundSource. Replace with a more generic AutoRemoveMode enum which is now used by both SoundSource & ParticleEmitter. 2016-08-13 16:25:16 +03:00
Yao Wei Tjong 姚伟忠
de3c2dc2b5 Fix cache datatype typo when caching the URHO3D_LIB_TYPE. 
Credit to hsnabn. Close #1513.
 2016-08-13 11:44:10 +08:00
Lasse Öörni
a2d86f1a59 Get screenshot as RGBA on OpenGL ES to fix Android black screenshot. 2016-08-12 00:06:39 +03:00
Lasse Öörni
a76fc0a316 Undefine GetObject in TileMapLayer2D.h to prevent it getting confused with Win32 API function define. To help, the header should be included after Windows.h is included. Related to #1512. 2016-08-10 17:59:11 +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
Lasse Öörni
2f25c3b98d Add note to discourage use of AddComponent(). Prevent attempting to assign model resource on StaticModel / AnimatedModel when no node set. Closes #1510. 2016-08-09 15:15:12 +03:00
Yao Wei Tjong 姚伟忠
e2bad7d2c2 For CI - fix release tag packaging for master branch. 2016-08-08 19:44:35 +08:00
Lasse Öörni
0c6bd7f1ec Merge pull request #1508 from BlueMagnificent/master 
Minor Typo correction
 2016-08-08 01:36:54 +03:00
Nwokoma Uchechukwu
06b0dc94de Minor Typo correction 2016-08-07 23:32:23 +01:00
Lasse Öörni
f89696e83f Fix FileSystem.cpp on Android to not use the removed string + char operator. 2016-08-07 18:18:28 +03:00
Lasse Öörni
8ee9ec8236 Add porting note on the String add operator with char parameter removal. 2016-08-07 18:18:27 +03:00
Lasse Öörni
939e7c9fd3 Revert "String + number operator". Remove String + operator with char parameter to prevent accidental truncation and replace with string literal concatenation where needed. 
This reverts commit fafd921f32.
 2016-08-07 18:18:27 +03:00
Yao Wei Tjong 姚伟忠
44b0450268 Fix setup_xxx() macros not to wrongly replace linker flags. 
This should solve the missing -pie linker flags for Android build.
 2016-08-07 22:12:39 +08:00
Yao Wei Tjong 姚伟忠
b21ff1895e Fix overlinking of EGL library in FindVideoCore.cmake module. 
Remove hardcoding of indirect dependency libraries list in the FindUrho3D.cmake module. Instead we now rely on the linker to find those indirect dependencies automatically with our hint via "-runpath-link" linker flag, especially when cross-compiling.
Also setup GLESv2 (and GLESv1_CM) for Raspberry-Pi in the same manner as generic ARM and Android platforms.
 2016-08-07 18:22:46 +08:00
urho3d-travis-ci
b856bfbcd0 Travis CI: API documentation update at 2016-08-06 15:39:52 UTC. 
[ci package]

Commit: a44c0a7a43

Message: Capitalization & other minor code style edits to the SDL raw event sending. Sync contributor credits.
 2016-08-06 15:39:52 +00:00
Lasse Öörni
a44c0a7a43 Capitalization & other minor code style edits to the SDL raw event sending. Sync contributor credits. 2016-08-06 18:24:52 +03:00
Rokas Kupstys
522d429c3a Updated my name in contributors list 2016-08-06 15:47:41 +03:00
Rokas Kupstys
d48c4120a1 E_INPUTBEGIN, E_INPUTEND, E_SDLRAWINPUT 2016-08-06 15:47:40 +03:00
Yao Wei Tjong 姚伟忠
9908b08e83 For CI - fix the housekeeping logic for the SF.net. 
The old snapshots were not being removed in the correct order due to a bug in the housekeeping logic. Since we have more build artifacts per build now, reduce to only keep the build artifacts from the lasts 10 builds instead of 30.
Also generate 64-bit ARM RPM package using 'lib64' (suitable for RH/Fedora) for completeness sake.
[ci package]
 2016-08-06 19:38:20 +08:00
Yao Wei Tjong 姚伟忠
98414a9ad6 Shorten the package name for ARM build due to space constraint. 
Fix 32-bit ARM packaging build on 64-bit Travis-CI host system.
[ci package]
 2016-08-06 17:32:36 +08:00
Yao Wei Tjong 姚伟忠
362912078b Change the package name for generic ARM platform to use all caps. 
[ci package]
 2016-08-06 14:10:06 +08:00