Commit Graph

114 Commits

Author SHA1 Message Date
6ed03e3e7d Fix Compile Error 2017-04-20 22:09:33 +08:00
07c24d8198 Merge branch 'mingw-dev' into mingw-dev-renderer-x
Fix Conflicts. Catch up with main develop branch.
2017-04-20 22:02:39 +08:00
9090acdc0f Merge branch 'mingw-dev-sqlite' into mingw-dev
Accept Changes from branch Dev-SQLite
Modern C++ is GREAT !
2017-04-19 14:25:40 +08:00
06f2d8e448 Add Template Variable Parameter For class Timer 2017-04-19 14:11:08 +08:00
b9d10a9372 Add Template variable parameter
Now, SQLDB::exec(SomeCommand,NormalFunction,NormalParamenters...) is
allowed.
Modern C++ !
2017-04-19 09:19:51 +08:00
43ff36f8c6 Merge branch 'mingw-dev-sqlite' into mingw-dev
SQLite is perfect! Accept it from branch 'mingw-dev-sqlite'.
2017-04-16 20:37:48 +08:00
f264e7ce16 Fix include compile error 2017-04-16 20:24:54 +08:00
32d5cdee28 Rename SQLite Wrapper 2017-04-16 18:24:48 +08:00
9ac5f9833a Update SQLite Wrapper
Remove debug outputs.
Add Error Message handling interfaces.
Add namespace (MiniEngine::SQL).
2017-04-16 18:19:21 +08:00
92f2d9b4af Change pointers to smart pointer (shared_ptr) 2017-04-16 17:32:39 +08:00
95dbdbd277 Merge branch 'mingw-dev' into mingw-dev-sqlite
Catch up with main develop branch.
2017-04-16 16:15:15 +08:00
ba350b6f3b Fix Compile Warning in Renderer::superCopy 2017-04-16 16:12:58 +08:00
9ed5e15d6b Add SQLite Wrapper 2017-04-16 16:00:44 +08:00
fd8642ce7f Add SQLite Support 2017-04-16 16:00:28 +08:00
dca9c0fc07 Merge branch 'master' into mingw-dev
This is a fast forward merge, but we use '--no-ff' to avoid fast-forward
2017-04-15 15:24:43 +08:00
cc2823c46a Merge pull request #4 from Kiritow/pre-merge
Get Ready For First Release!
2017-04-14 21:23:14 +08:00
bbb8bed2db Merge branch 'mingw-dev' into pre-merge
Ready For Release!
2017-04-14 21:11:46 +08:00
7650d1fde9 Add MIT License 2017-04-14 21:01:32 +08:00
d9b26de617 Add Scaled Blit Functions to Surface 2017-04-14 20:46:07 +08:00
3043ae0684 Add Texture-like functions in class Surface 2017-04-13 09:03:44 +08:00
a2a3e493c5 Add Rendering-like functions in class Surface 2017-04-12 09:50:12 +08:00
40c5f0dc91 Add some power functions 2017-04-12 09:26:03 +08:00
085463c873 Add BlendMode caster 2017-04-12 09:22:15 +08:00
3267be4a4e Add support of getting width and height of Surface. 2017-04-12 09:03:03 +08:00
a315daa453 [New] Font support rendering to Surface
Now Font support rendering to Surface instead of Texture. If Renderer
not passed in, Font will generate a Surface.
2017-04-12 08:55:25 +08:00
e7372dcf5f Add Implements of GetArgc and GetArgv 2017-04-12 08:44:58 +08:00
c7a60f90a2 [Update] Change Smart Pointers to internal.
Smart pointers are now internal variables (with a '_' before its name).
And 3 methods are added (_get, _set, _clear)

[New] Now Renderer support loading surface and texture from RWop.
2017-04-12 08:40:12 +08:00
da85418b60 Fix Bugs about Renderer
We have met a runtime error with SDL_IsClipEnabled. There is not
solution to it yet, so we just disable it.
Fix Bug in Window::_setRenderer_Real. smart pointer rnd is now reset
first. (We have known that smart pointers will only change its value
when it has the exact new value.)
2017-04-10 21:48:06 +08:00
186df0d60c Merge pull request #2 from Kiritow/pre-merge
Accept Changes From Develop Branchs
2017-04-10 21:20:59 +08:00
94a8afd09c Fix compile error in VS. Include path changed. 2017-04-10 21:14:12 +08:00
7f238b9935 Merge branch 'mingw-dev' into pre-merge 2017-04-10 20:49:07 +08:00
7570bee178 Add Surface::savePNG, powered by IMG_SavePNG. 2017-04-10 19:52:40 +08:00
01735059fc Add Support for SDL_RWops 2017-04-10 15:27:24 +08:00
db29ed54f6 Update README.md 2017-04-07 16:50:53 +08:00
6b53686383 Add support for Viewport and ClipRect setting.
New Method in class Renderer: setViewport/getViewport ,
setClipRect/getClipRect... , drawLine
class Rect can be initialized from SDL_Rect now.
2017-04-07 16:39:35 +08:00
67009f9bcb Add download link for other libraries. 2017-04-06 13:15:41 +08:00
fb6bee96a7 [Fix Bug] Renderer Settings
We changed shared_ptr to weak_ptr in class Renderer and add a Renderer
shared_ptr in class Window.
Now, after calling Window::setRenderer, the original renderer is not
avaliable (SDL_Renderer* is NULL). And a new valid renderer is created.
2017-04-05 11:52:14 +08:00
af18ae23da Fix bug in setRenderer 2017-04-05 11:43:01 +08:00
f78eb839bf Rewrite setRenderer with template 2017-04-05 11:16:44 +08:00
592a4bbae4 Add Font Style Support 2017-04-05 09:23:13 +08:00
f3b1b2208c Add Timer Support 2017-04-04 20:33:41 +08:00
499c25ddd3 Remove Event Handling in main file 2017-04-04 09:49:18 +08:00
ccb47aad08 Add Start Paramenters API 2017-03-30 11:16:57 +08:00
c6bad3df80 C4droid does not support SDL_Drop... 2017-03-24 21:08:01 +08:00
32f91125e9 Add LogSystem 2017-03-24 13:50:48 +08:00
813de57b40 Merge pull request #1 from Kiritow/vs-dev
Accept Changes From Branch vs-dev
2017-03-24 11:12:24 +08:00
9a632324b7 Add TextInput in SDLSystem 2017-03-24 11:07:27 +08:00
73e5be6763 Fix bugs in UTF8ToGBK and GBKToUTF8
GBK->UTF8 x/2*3 UTF8->GBK x/3*2
2017-03-24 10:59:35 +08:00
c7c59975ca Add Font::ready()
Now we can check if a Font Object is Ready. ( Font Library Loaded )
2017-03-24 10:46:33 +08:00
dcd2d333b8 Fix File Operating functions in Windows Specific Version 2017-03-24 10:35:20 +08:00