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
Yao Wei Tjong 姚伟忠
fa82c55efd Suppress warnings on MinGW build. 2015-10-29 11:24:03 +08:00
Lasse Öörni
239ab98315 Omit static keyword from kNet's custom debug memory allocation functions to allow compilation on VS2015 Update 1. 2015-10-28 20:16:23 +02:00
Yao Wei Tjong 姚伟忠
db5cb36057 Remove the quick fix now that the ABI is correctly detected for MinGW. 
Related to #872 and commit 6ca3bdbb1c.
 2015-10-28 19:15:59 +08:00
urho3d-travis-ci
5270af7bb1 Travis CI: API documentation update at 2015-10-28 08:30:46 UTC. 
[ci package]

Commit: 416da06b74

Message: Merge pull request #989 from newbthenewbd/master

Fix Android MIPS build
 2015-10-28 08:30:46 +00:00
Lasse Öörni
416da06b74 Merge pull request #989 from newbthenewbd/master 
Fix Android MIPS build
 2015-10-28 10:18:13 +02:00
Newb I the Newbd
dd2494cb33 Fix Android MIPS build. 2015-10-28 03:07:45 +01:00
urho3d-travis-ci
aa60a1aea6 Travis CI: API documentation update at 2015-10-27 22:51:55 UTC. 
[ci package]

Commit: eff2c913e8

Message: Remove defined_ bool from Rect & Sphere. Closes #986.
 2015-10-27 22:51:55 +00:00
Lasse Öörni
eff2c913e8 Remove defined_ bool from Rect & Sphere. Closes #986. 2015-10-28 00:40:20 +02:00
Lasse Öörni
af0e558a5a Added contributor credit. 2015-10-27 22:13:26 +02:00
Lasse Öörni
554b72d926 Merge remote-tracking branch 'newbthenewbd/master' 2015-10-27 20:59:28 +02:00
Lasse Öörni
608183ba22 Reset HashMap & HashSet bucket pointers when beginning clear. As ResourceCache may not be returned during exit phase, add nullchecks to ScriptFile & Shader. Should help with #988. 2015-10-27 15:00:04 +02:00
Lasse Öörni
812e019d03 Minor whitespace edit. 2015-10-27 11:20:50 +02:00
Newb I the Newbd
e43113ee9c Unite hardware keyboard input with other platforms. 2015-10-27 09:01:03 +01:00
cosmy1
c8fb90898f Trigger double-click event over no element 
Since E_UIMOUSECLICK is triggered also over no element most people want the same effect with E_UIMOUSEDOUBLECLICK
 2015-10-26 15:08:33 +01:00
Lasse Öörni
1b7e1fdf5c Simplify code and use static cast since the type is checked beforehand. Allow to create CollisionChain2D from editor. 2015-10-26 11:19:11 +02:00
cosmy1
444695f2a6 Check vertices count 
Check vertices count for chain shape collision before creating fixture.
 2015-10-26 10:49:48 +02:00
urho3d-travis-ci
55d97b1ba9 Travis CI: API documentation update at 2015-10-25 19:13:43 UTC. 
[ci package]

Commit: 13bc777ab6

Message: Fix using old attribute name in the editor. Closes #979.
 2015-10-25 19:13:43 +00:00
Lasse Öörni
13bc777ab6 Fix using old attribute name in the editor. Closes #979. 2015-10-25 20:57:05 +02:00
Lasse Öörni
60d946eb64 Option to enable threaded occlusion rendering. May actually result in worse performance, so disabled by default. Report number of rendered occluders accurately (taking into account occluders rejected by being occluded themselves, or by running out of triangles.) Closes #970. 2015-10-25 20:53:25 +02:00
Lasse Öörni
9661f33f01 Fix uninitialized variables in ParticleEmitter. Closes #981. 2015-10-25 20:44:05 +02:00
ninjastone
4daf7fd3f0 Added rendering scale to UI 2015-10-26 01:35:44 +09:00
Yao Wei Tjong 姚伟忠
d7bc2d6a0d Move GetFileSizeString() to StringUtils. 2015-10-24 10:34:04 +08:00
Lasse Öörni
ae52d8ce45 Fix logging in Engine.cpp. 2015-10-23 22:31:54 +03:00
Lasse Öörni
58a6c38088 Minor documentation updates to refer to the renamed macros. 2015-10-23 22:27:55 +03: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
Yao Wei Tjong 姚伟忠
6ca3bdbb1c Rectify the 64-bit detection logic for MinGW compiler toolchain. 
Only use stackrealign flag on MinGW SSE 32-bit build.
For Travis CI - fix documentation build on all Windows builds. Fix #951.
 2015-10-23 23:07:26 +08:00
Yao Wei Tjong 姚伟忠
6ccf70be10 Add Windows Kit detection for Windows 10. 
Close #911.
 2015-10-23 22:54:35 +08:00
urho3d-travis-ci
92e976eb0f Travis CI: API documentation update at 2015-10-23 11:53:15 UTC. 
[ci package]

Commit: 6f60ee7f48

Message: Print memory use for all resources in ResourceCache::PrintMemoryUsage(). Change memory budget & use API to use unsigned long long (64bit). Expose GetFileSizeString() to script. Refactor Engine to use PrintMemoryUsage(). Match width of profiler and resource outputs. Rename Profiler::GetData() to Profiler::PrintData() to match the new ResourceCache function.
 2015-10-23 11:53:15 +00:00
Lasse Öörni
6f60ee7f48 Print memory use for all resources in ResourceCache::PrintMemoryUsage(). Change memory budget & use API to use unsigned long long (64bit). Expose GetFileSizeString() to script. Refactor Engine to use PrintMemoryUsage(). Match width of profiler and resource outputs. Rename Profiler::GetData() to Profiler::PrintData() to match the new ResourceCache function. 2015-10-23 14:12:13 +03:00
Lasse Öörni
19027b4ae4 Merge remote-tracking branch 'JSandusky/MemoryReporting' 2015-10-23 11:55:20 +03:00
urho3d-travis-ci
d3e5abb45f Travis CI: API documentation update at 2015-10-23 07:07:21 UTC. 
[ci package]

Commit: 83d0f9a23c

Message: Add Z-up and handedness options to OBJ export
 2015-10-23 07:07:21 +00:00
JSandusky
83d0f9a23c Add Z-up and handedness options to OBJ export 2015-10-22 22:44:28 -04:00
JSandusky
379a80f3f5 Remove ambiguity from ResourceCache mem use printing of lines 2015-10-22 20:06:14 -04:00
JSandusky
8e39692ef3 Show "Memory usage" DebugHud in all samples (F3 key) 2015-10-22 19:49:49 -04:00
JSandusky
44aac796fb Add resource memory usage display to DebugHud 2015-10-22 19:49:14 -04:00
Ivan K
4532a3a72e LOGRAWF -> URHO3D_LOGRAWF 2015-10-23 00:34:01 +04:00
Ivan K
4b015f3c51 LOGERRORF -> URHO3D_LOGERRORF 2015-10-23 00:32:06 +04:00
Ivan K
bfe60520bd LOGWARNINGF -> URHO3D_LOGWARNINGF 2015-10-23 00:29:24 +04:00
Ivan K
f3de678cfd LOGINFOF -> URHO3D_LOGINFOF 2015-10-23 00:28:05 +04:00
Ivan K
c9a77c8d56 LOGDEBUGF -> URHO3D_LOGDEBUGF 2015-10-23 00:26:04 +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
d53fc4b94b LOGINFO -> URHO3D_LOGINFO 2015-10-22 23:59:47 +04:00
Ivan K
0c3f67abfe LOGDEBUG -> URHO3D_LOGDEBUG 2015-10-22 23:53:15 +04:00
Ivan K
ec17b8f73d IS_ASSET -> URHO3D_IS_ASSET 2015-10-22 23:44:39 +04:00
Ivan K
d78219d014 ASSET -> URHO3D_ASSET 2015-10-22 23:41:04 +04:00
Lasse Öörni
48c600711a Fix wrong boolean check for determining what viewport read/write operations are used by the renderpath. Closes #974. 2015-10-22 12:22:59 +03:00
Lasse Öörni
7fc377b546 Make Text3D refresh the text batches (triggering font face reload) if the font texture(s) have data lost. Closes #967. 2015-10-22 00:44:54 +03:00
Lasse Öörni
c810f9908f DLL export specializations of the Swap function. 2015-10-21 23:00:05 +03:00