 David Wimsey
|
5b388cbb6d
Bringing up to date to match other examples
|
11 rokov pred |
|
David Wimsey
|
89ba166c8f
Merge branch 'hotfix/issue-199'
|
11 rokov pred |
|
David Wimsey
|
f9b618c973
Fixes linker issues when linking statically to lua on Windows platforms as required by VisualStudio. This should probably be resolved by making Vector2f and Vector2i opaque from outside of libRocket Core rather than exposing the templates outside of libRocket. Keeping the classes opaque would allow the implementation to change in a shared library without requiring the application to be recompiled to pickup the changes. This fixes #199.
|
11 rokov pred |
|
David Wimsey
|
a797fca985
Merge branch 'master' of https://github.com/libRocket/libRocket
|
11 rokov pred |
|
David Wimsey
|
44c3e8ee37
Merge pull request #207 from bruceoutdoors/sfml2-fix
|
11 rokov pred |
|
David Wimsey
|
b85abf147a
Fixes DLL linkage issues on Windows due to library rename, using different defines when projects are generated by CMake
|
11 rokov pred |
|
David Wimsey
|
25ae2fa63e
Switched from wildcard to specific listing of project files, this will help make sure we don't accidentally ignore a new one in the future because it was caught by a wildcard ignore
|
11 rokov pred |
|
David Wimsey
|
e92284416a
Adding some VisualStudio ignores
|
11 rokov pred |
|
David Wimsey
|
6dc285e8bb
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix2' into stable
|
11 rokov pred |
|
David Wimsey
|
d50adff6fb
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix2'
|
11 rokov pred |
|
David Wimsey
|
41ff4e6162
Properly fix the Lua/check() macro collision
|
11 rokov pred |
|
David Wimsey
|
b0cc467d4a
Merge branch 'hotfix/sfml2-opengl-includes' into stable
|
11 rokov pred |
|
David Wimsey
|
9e1af325f4
Merge branch 'hotfix/sfml2-opengl-includes'
|
11 rokov pred |
|
David Wimsey
|
c6feeac24b
This fix deals with selecting the right OpenGL headers based on operating system using the existing code in the shell library.
|
11 rokov pred |
|
David Wimsey
|
fb8ccd4bd4
Merge commit '5372e08aba0d72dec4cf9fbca0f3723bba0914a8'
|
11 rokov pred |
|
David Wimsey
|
38ea8ef14c
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix'
|
11 rokov pred |
|
David Wimsey
|
637db9ba98
Merge branch 'hotfix/directx-skiplist-all'
|
11 rokov pred |
|
David Wimsey
|
a7781d94c3
Avoids building DirectX 10 sample properly
|
11 rokov pred |
|
David Wimsey
|
c395224d16
Fixes SKIP_DIRECTX_SAMPLES to actually skip building directx9 and directx10 samples
|
11 rokov pred |
|
David Wimsey
|
a431ca14ef
Fix to avoid naming collisions between macros defined in AssertMacros.h on OSX and LuaType::check
|
11 rokov pred |
|
David Wimsey
|
5c2558f69f
Merge pull request #173 from libRocket/feature/cmake-osx-lib-naming-convention
|
11 rokov pred |
|
David Wimsey
|
84a78d139c
Removed Debug suffix completely based on input from Tom Mason @wheybags and general usage within other projects. Continuous integration builds use separate directories for build configuration type which works as well as the name suffix
|
11 rokov pred |
|
David Wimsey
|
7b3d201a37
Merge pull request #203 from libRocket/feature/cmake-samples
|
11 rokov pred |
|
David Wimsey
|
6669f3a2bd
Added default hint for SFML location in our dependancies directory
|
11 rokov pred |
|
David Wimsey
|
eb75a98e93
Switched to using FindSFML.cmake from SFML distribution
|
11 rokov pred |
|
David Wimsey
|
9c043cf763
Merge pull request #208 from libRocket/feature/osx-python-fixes
|
11 rokov pred |
|
David Wimsey
|
a3317ea5f3
Merge pull request #205 from bruceoutdoors/invaders-sample-fix
|
11 rokov pred |
|
David Wimsey
|
5372e08aba
Fix some minor warnings which have no effect on code produced
|
11 rokov pred |
|
David Wimsey
|
9709407b29
Fix some issues found by the Visual Studio 2012 static analyzer.
|
11 rokov pred |
 Lee Zhen Yong
|
b315b90ce8
bug fix: SFML2 example runtime error when application closes, caused by memory leaks
|
11 rokov pred |
