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
MonkeyFirst
b0cade9697 add global handlers 2017-01-17 06:24:55 +07:00
MonkeyFirst
984ba731bb PaintSelection and Origins 2017-01-17 06:23:21 +07:00
Yao Wei Tjong 姚伟忠
5db9581a97 For CI - keep Travis happy - old Ruby version doesn't support grep_v(). 
[ci only: Web]
 2017-01-16 01:36:45 +08:00
Yao Wei Tjong 姚伟忠
cd0b9c463c For CI - attempt to reuse the web package uuid to reduce commit size. 
Close #1762.  [ci only: Web]
 2017-01-16 00:58:41 +08:00
Lasse Öörni
34db6678e2 Merge pull request #1763 from KonstantinTomashevich/fix-copy-paste-error-in-seializable-macro-docs 
Fix copy-paste error in comment to URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE.
 2017-01-15 16:45:02 +02:00
Konstant
2e38a651c7 Fix another typo in Serializable macro docs. 2017-01-15 14:43:02 +02:00
Konstant
ff12f61382 Fix small error in Serializable.h in URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE docs. 2017-01-15 14:33:43 +02:00
Lasse Öörni
a4d2c052ec Fix Text3D not showing other batches correctly, than the first. Closes #1758. 2017-01-14 22:36:50 +02:00
Yao Wei Tjong 姚伟忠
1481228bb5 For CI - fix the sample upload task to preserve the index.md file. 
Change the task execution order. Now upload samples first then perform packaging build, if it is required. The artifacts may have been ruined after the packaging build.
[ci only: Web]
 2017-01-14 18:02:53 +08:00
Yao Wei Tjong 姚伟忠
ed22596dbf For CI - upload web samples from each CI build. 
It appears that peoples are expecting this instead. Previously the samples were only uploaded during "packaging" build which is only triggered whenever there is "big" code changes.
[ci only: Web]
 2017-01-14 16:26:45 +08:00
urho3d-travis-ci
cc2e166157 Travis CI: API documentation update at 2017-01-12 16:29:43 UTC. 
[ci package]

Commit: f20475161f

Message: Add XMLFile::GetOrCreateRoot() & XMLElement::GetOrCreateChild(). Closes #1756.
 2017-01-12 16:29:43 +00:00
Lasse Öörni
f20475161f Add XMLFile::GetOrCreateRoot() & XMLElement::GetOrCreateChild(). Closes #1756. 2017-01-12 18:15:36 +02:00
Lasse Öörni
bd95787c1a Fix Web build Urho3DPlayer not reading script file name from Module.arguments. Make sure the error exit due to no script name happens. 2017-01-11 14:56:54 +02:00
Lasse Öörni
0e1e46fbb9 Refactor Urho3DPlayer to attempt reading CommandLine.txt from the resource system later on all platforms, if reading from the filesystem fails. Closes #1754. 2017-01-10 20:13:59 +02:00
Yao Wei Tjong 姚伟忠
d42723a45e Enable high DPI on Apple retina display device by default. 
High DPI mode can still be programmatically disabled via Engine parameter only.
 2017-01-10 23:43:03 +08:00
Lasse Öörni
314a3af082 Fix artifacts in SDF text effects when supersampling is off. 2017-01-10 11:46:03 +02:00
Lasse Öörni
09762ae735 Merge remote-tracking branch '1vanK/master' 2017-01-10 11:06:12 +02:00
urho3d-travis-ci
9fb189a51c Travis CI: API documentation update at 2017-01-10 08:03:34 UTC. 
[ci package]

Commit: d229db148c

Message: When Input detects screen mode change (initial or otherwise), calculate scaling ratio from SDL window size and Graphics backbuffer size. Scale mouse positions and deltas with the input scale. Inspired by work of Elissa Ross in PR #1725. Related to issue #1252, might resolve it, but not tested on actual Retina hardware.
 2017-01-10 08:03:34 +00:00
Lasse Öörni
d229db148c When Input detects screen mode change (initial or otherwise), calculate scaling ratio from SDL window size and Graphics backbuffer size. Scale mouse positions and deltas with the input scale. Inspired by work of Elissa Ross in PR #1725. Related to issue #1252, might resolve it, but not tested on actual Retina hardware. 2017-01-10 09:52:42 +02:00
Yao Wei Tjong 姚伟忠
20b3b18602 For CI - modify JSON data file for web samples. 
[ci skip]
 2017-01-09 00:51:27 +08:00
1vanK
51c6fb5e2d SDF supersampling 2017-01-08 16:56:32 +03:00
Lasse Öörni
8b4ddd5289 Use ALPHAMAP shader define in Text shader to differentiate between alpha texture (TTF) and RGBA (bitmap fonts). Closes #1750. 2017-01-07 19:09:05 +02:00
Lasse Öörni
883b5105cb Merge branch 'master' into update-angelscript 2017-01-07 16:40:55 +02:00
Yao Wei Tjong 姚伟忠
53d213eb50 Minor refactor to remove the '***' as the repeat indicator. 
The script already knows when the nested attributes repeat itself.
 2017-01-07 14:08:37 +08:00
Yao Wei Tjong 姚伟忠
8fd264c73e Fix minor typo in editor resource browser script. 2017-01-07 13:02:36 +08:00
Lasse Öörni
e22de44be5 Restore Urho3D tweaks to as_config.h and earlier ifdef check for C++11 features. 2017-01-06 15:54:42 +02:00
Lasse Öörni
080bf36f9f Restore earlier ifdef for AS type traits due to some Android CI builds failing. 2017-01-06 11:12:55 +02:00
Lasse Öörni
f7c7d4db3c Fix logo aspect ratio in Emscripten shell page. 2017-01-05 23:38:49 +02:00
Yao Wei Tjong 姚伟忠
ffa79e2bef Add contributor credit. 2017-01-05 00:17:12 +08:00
Yao Wei Tjong 姚伟忠
be51253606 For CI - suppress stderr when there are nothing added to the index. 2017-01-05 00:14:06 +08:00
Lasse Öörni
fe2d6cf21a Add contributor credit. 2017-01-04 16:13:46 +02:00
Lasse Öörni
c548d8ed24 Merge remote-tracking branch 'arnislielturks/console-update' 2017-01-04 16:05:28 +02:00
Lasse Öörni
458830d1c7 Fix crash in usedGlyphs mode. Fix AS binding for Font::SaveXML taking a Serializer. Closes #1746. 2017-01-04 15:48:47 +02:00
Lasse Öörni
e93fa4d7b3 Replace small version of old logo with slightly larger picture. For now editor does not display a logo in the top bar, since the new logo would become mostly illegible. 2017-01-04 14:39:14 +02:00
Arnis Lielturks
e89a769a76 console text highlighting, style detection by log level improved 2017-01-04 10:50:19 +02:00
Yao Wei Tjong
b6f10c6f48 Merge pull request #1739 from koja/cmake_fix 
Avoid special chars in paths in MRI script passed to ar utility
 2017-01-04 09:24:03 +08:00
Arnis Lielturks
fad8c6c51b Console.cpp indentation fixed 2017-01-03 20:02:37 +02:00
urho3d-travis-ci
42f40ad64f Travis CI: API documentation update at 2017-01-03 16:25:53 UTC. 
[ci package]

Commit: 48b82e136e

Message: Fix typo in Editor scripts.
 2017-01-03 16:25:53 +00:00
Eugene Kozlov
48b82e136e Fix typo in Editor scripts. 2017-01-03 18:27:06 +03:00
Jan Korous
524fba130f Simplified regex for MRI script special chars 2017-01-03 16:22:35 +01:00
Arnis Lielturks
ffbe619c8a log message colour in console displayed based on it's type 2017-01-03 17:09:59 +02:00
Lasse Öörni
019862a8f7 Fix end of line typo in FontFace.cpp. Closes #1744. 2017-01-03 13:25:43 +02:00
Lasse Öörni
83e4651e77 Replace Android sample launcher logo. Fix minor typo in script selector. 2017-01-02 20:25:35 +02:00
Lasse Öörni
3b911a2adc Update Android icons. 2017-01-02 19:49:27 +02:00
Lasse Öörni
496b2d39f8 Merge remote-tracking branch 'Modanung/new-icon' 2017-01-02 19:16:53 +02:00
Lasse Öörni
f5b68769d0 ElementsNames -> ElementNames. 2017-01-02 18:19:58 +02:00
Lasse Öörni
b5a7d764bd Replace "***" with a divider element. 2017-01-02 18:11:12 +02:00
Lasse Öörni
c9884af9a6 Minor code edit, prefer GetObjectAttributeInfos() since it's asking for a single object's attributes. 2017-01-02 17:57:47 +02:00
Lasse Öörni
1f1433847d Merge remote-tracking branch 'KonstantinTomashevich/allow-define-vector-structs-attributes' 2017-01-02 17:43:15 +02:00
Modanung
c17a63dd57 Switched to new icon 2017-01-02 11:47:22 +01:00