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
Lasse Öörni
efefbca976 Merge remote-tracking branch 'remotes/friesencr/bump_freetype' 2013-10-14 22:39:09 +03:00
Yao Wei Tjong 姚伟忠
5896e52552 Filter target architecture information if the tool is available. 
The initial target architecture detection for LuaJIT on Raspberry Pi native build was painfully slow due to the amount of output produced by compiler.
The filter reduces the number of output rows and speeds up the process significantly.
 2013-10-14 10:39:31 +08:00
Chris Friesen
12d22bd8cc update freetype 2013-10-13 16:18:28 -05:00
Lasse Öörni
6e3dde8a10 Merge branch 'font2' 2013-10-13 21:43:42 +03:00
Lasse Öörni
267523a738 Adapted Aster Jian's mutable glyph mechanism. Globally switchable on from the UI subsystem. Configurable font texture max size in UI subsystem. 2013-10-13 21:42:36 +03:00
Yao Wei Tjong 姚伟忠
405e89b5f2 Fixed LuaJIT native build on Raspberry Pi. 
Missed out one more condition check before applying -m32/64 flag.
 2013-10-14 00:22:32 +08:00
Lasse Öörni
b1b60edbf4 Code cleanup. 2013-10-13 17:28:05 +03:00
Lasse Öörni
ecc37d1f2e If all font's glyph do not fit into one page, begin filling texture pages dynamically as glyphs are used. 2013-10-13 17:17:00 +03:00
Yao Wei Tjong 姚伟忠
441ab9e5d4 Fixed LuaJIT native build on Raspberry Pi. 
Only set the assembler flag to either -m32 or -m64 when the target architecture is X64.
 2013-10-13 21:46:58 +08:00
Yao Wei Tjong 姚伟忠
04034d088f Fixed native build against latest Pidora/Raspberry Pi firmware. 
Related to issue #17.
 2013-10-13 16:33:49 +08:00
Yao Wei Tjong 姚伟忠
18a05df3bd Attempt to fix issue#17. Find EGL shared lib explicitly. 2013-10-13 15:50:34 +08:00
Lasse Öörni
9d0eb0ffae If a rigid body is kinematic, set it to never deactivate itself. 2013-10-12 21:22:47 +03:00
Lasse Öörni
8d5aa5bbd2 Fix UNICODE define in SDL not taking effect properly with new MinGW. 2013-10-12 18:37:58 +03:00
Lasse Öörni
e408d1b614 Fix GCC 4.8 undefined behavior warnings. 2013-10-12 18:37:58 +03:00
Yao Wei Tjong 姚伟忠
74601477fe Support LuaJIT amalgamated build. 
Added new build option ENABLE_LUAJIT_AMALG.
 2013-10-12 22:26:43 +08:00
Lasse Öörni
752051b86f Correct kNet winsock2.h include order. Fixes #16. 2013-10-12 16:58:52 +03:00
Lasse Öörni
c6a6f71aa3 Finalize LZ4 support. Do not repeatedly allocate compressed data buffer. Do not store global blocksize into the package file header. Increased Android read buffer to 32KB. 2013-10-12 15:03:17 +03:00
Lasse Öörni
1463b67a70 Added documentation on the package file format. 2013-10-12 15:03:17 +03:00
Lasse Öörni
30ce75fd68 LZ4 compressed package file support. Closes #6. 2013-10-12 15:03:17 +03:00
Yao Wei Tjong
8d94a287d5 Make batches consistent with shell script behavior. 
Batch reads from CMake cache, if necessary, when the option is not passed explicitly.
 2013-10-12 12:23:57 +08:00
Lasse Öörni
48a53a61e9 Fix endless loop if trying to print a log message causes more messages to be logged. Closes #14. 2013-10-10 22:42:49 +03:00
Lasse Öörni
c097d8f122 Fix OpenGL texture partial update. 2013-10-10 21:52:31 +03:00
Yao Wei Tjong 姚伟忠
b5836237e9 Remove dependency on Lua when LuaJIT is enabled. 
Change build option name from ENABLE_LUA_JIT to ENABLE_LUAJIT.
Change tolua++ lua scripts to be compatible with both LuaJIT and Lua. Replace toluabind.c with the corresponding bytecode.
 2013-10-11 02:02:08 +08:00
Lasse Öörni
5da7d24f94 Fixed bug in D3DTexture2D && D3DTextureCube::SetData() when not setting the whole texture. 2013-10-10 18:53:26 +03:00
Yao Wei Tjong 姚伟忠
46f5f21f59 Fixed issue #12. Reorder library dependency list. 
It seems Debian is not as forgiving as Redhat on the external library list order.
 2013-10-10 17:44:53 +08:00
Yao Wei Tjong 姚伟忠
8f3a0fc6c0 Added another Eclipse project setting file into .gitignore. 
Source/.settings is created when user modifies the source code encoding setting (among others).
 2013-10-10 14:28:43 +08:00
Lasse Öörni
9b037e938d Mono font rendering fix from Aster Jian's font branch. 2013-10-09 22:14:08 +03:00
aster2013
475ddbe99d Fixed Text Shadow Effect bug. 2013-10-09 22:02:12 +03:00
Yao Wei Tjong
76ba362179 Rephrased instructions to overcome CMake error for LuaJIT cross-compilation build. 2013-10-09 00:59:19 +08:00
Yao Wei Tjong
756728d5d1 Fixed 32-bit LuaJIT compilation on Linux platform. 2013-10-08 23:26:02 +08:00
Lasse Öörni
f6213623ed Workaround for VS2008 64-bit mode. 2013-10-08 12:45:49 +03:00
Yao Wei Tjong
28ab693b6a Fixed LuaJIT CMake error on Windows platform. 2013-10-08 15:47:14 +08:00
Yao Wei Tjong
2b90804c6e Fixed LuaJIT build on Linux, both native and cross-compiling. 
The following platforms should be now supported:
Windows, Linux, Mac OS X, IOS, Android, and Raspberry Pi. Not all platforms are fully tested yet.

Cross-compilation may work on GCC/CLang only.
 2013-10-08 12:22:56 +08:00
Lasse Öörni
dc2e59af7f Do not use a layout on a ScrollBar as using it can lead to resizing the ScrollBar itself, which is irreversible. Fixes #11. 2013-10-07 23:18:44 +03:00
Lasse Öörni
4186e48b7f Set internal flag on ListView containers before adding as a child. Fixes #10. 2013-10-07 16:38:41 +03:00
weitjong
d834fd571d Merge local branch. 2013-10-07 13:09:10 +08:00
weitjong
2ef2e65872 Recreate "assets" directory back in Git repository. 
Git does not handle empty directory like SVN. A directory in Git must at least contain a file to be tracked.
Added .gitignore to do the work and at the same time tell Git to ignore all the symlinks/files in this directory.
 2013-10-07 12:45:07 +08:00
weitjong
633a7f4804 Renamed IOS and Mac OS X framework macros. 
These macros may be used later not just to setup frameworks but also
other linker flags.

Renamed setup_ios_frameworks    -> setup_ios_linker_flags.
Renamed setup_macosx_frameworks -> setup_macosx_linker_flags.
 2013-10-07 00:12:01 +08:00
Lasse Öörni
da8a3bb359 Merge remote-tracking branch 'remotes/friesencr/escape_quickmenu' 2013-10-06 14:24:35 +03:00
weitjong
1cdd74f3da Support more source file extensions. 
Added support for: .mm (Objective-C++ source code) and .s (preprocessed assembly source code).
 2013-10-06 18:37:05 +08:00
weitjong
1afb83b10b Generated sources are defined before normal sources. 
To be consistent with the rest of the CMakeLists.txt.
 2013-10-06 14:01:11 +08:00
weitjong
598c24a4aa Corrected usage of message() command for showing CMake status. 2013-10-06 14:01:10 +08:00
weitjong
d98c8b4d64 Updated documentation on build option being cached. 2013-10-06 14:01:10 +08:00
weitjong
9a90fe4665 Added execute bit for cmake_clean.sh. 2013-10-06 14:01:10 +08:00
Lasse Öörni
87e1761a31 Reorder GetType() & GetBaseType() functions in headers for consistency. 2013-10-06 02:10:03 +03:00
Chris Friesen
f96e9c1a45 add key_esc to kill quickmenu 2013-10-05 17:39:04 -05:00
Lasse Öörni
673d948950 Fix crash when loading another scene in the editor after loading a scene with physics constraints. 2013-10-06 00:11:58 +03:00
Lasse Öörni
c934342cec Trim path in AddTrailingSlash() & RemoveTrailingSlash() to be sure. Fix extra slashes appearing in scene load path in the editor. 2013-10-06 00:03:44 +03:00
Lasse Öörni
36eb726d36 Add the concept of base class type to Object to simplify determining if a ScriptInstance's handle variable is a Node, Component or Resource. Serialize script's resource handles as ResourceRef attributes and allow editing them. 2013-10-05 23:24:39 +03:00
Lasse Öörni
cfd2516000 Return window size for GetDesktopResolution() on mobile platforms due to possible SDL bug. 2013-10-05 19:20:05 +03:00