David Wimsey
|
b73cf5f6db
Merge branch 'hotfix/issue-199' into stable
|
преди 11 години |
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 години |
David Wimsey
|
6dc285e8bb
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix2' into stable
|
преди 11 години |
David Wimsey
|
41ff4e6162
Properly fix the Lua/check() macro collision
|
преди 11 години |
David Wimsey
|
b0cc467d4a
Merge branch 'hotfix/sfml2-opengl-includes' into stable
|
преди 11 години |
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 години |
David Wimsey
|
38ea8ef14c
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix'
|
преди 11 години |
David Wimsey
|
637db9ba98
Merge branch 'hotfix/directx-skiplist-all'
|
преди 11 години |
David Wimsey
|
a7781d94c3
Avoids building DirectX 10 sample properly
|
преди 11 години |
David Wimsey
|
c395224d16
Fixes SKIP_DIRECTX_SAMPLES to actually skip building directx9 and directx10 samples
|
преди 11 години |
David Wimsey
|
a431ca14ef
Fix to avoid naming collisions between macros defined in AssertMacros.h on OSX and LuaType::check
|
преди 11 години |
David Wimsey
|
5c2558f69f
Merge pull request #173 from libRocket/feature/cmake-osx-lib-naming-convention
|
преди 11 години |
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 години |
David Wimsey
|
7b3d201a37
Merge pull request #203 from libRocket/feature/cmake-samples
|
преди 11 години |
David Wimsey
|
6669f3a2bd
Added default hint for SFML location in our dependancies directory
|
преди 11 години |
David Wimsey
|
eb75a98e93
Switched to using FindSFML.cmake from SFML distribution
|
преди 11 години |
David Wimsey
|
9c043cf763
Merge pull request #208 from libRocket/feature/osx-python-fixes
|
преди 11 години |
David Wimsey
|
a3317ea5f3
Merge pull request #205 from bruceoutdoors/invaders-sample-fix
|
преди 11 години |
Lee Zhen Yong
|
f9d4f01685
fixed bug that cause invaders sample to be unable to run
|
преди 11 години |
David Wimsey
|
f1076e0f18
Various fixes to resolve issues with building python modules on OSX
|
преди 11 години |
David Wimsey
|
2150818ee6
Merge branch 'hotfix/issue-137' into stable
|
преди 11 години |
David Wimsey
|
18a0c5db05
Merge branch 'hotfix/issue-137'
|
преди 11 години |
David Wimsey
|
fea7fa35bc
Cleans up properties referring to a data source when the DataSource object is destroyed, fixes #137
|
преди 11 години |
Aleksey Kuleshov
|
409e96bbd7
satisfy CSS2 specification for LEFT, RIGHT, TOP, BOTTOM
|
преди 11 години |
David Wimsey
|
96db5cc7ec
Merge branch 'doc-updates' of https://github.com/dwimsey/libRocket
|
преди 11 години |
David Wimsey
|
8761d12977
Hack for functional non-compiled geometry in DirectX samples, this means the debugger will at least display now.
|
преди 11 години |
David Wimsey
|
a63199d727
Update basic copyright info
|
преди 11 години |
David Wimsey
|
b521c28567
Merge pull request #198 from libRocket/feature/resizable-samples-shell-windows
|
преди 11 години |
David Wimsey
|
90cb3fe93c
Fix for GLEW enabled SFML builds
|
преди 11 години |
David Wimsey
|
e2e42d2481
Added SFML cmake support, only builds the SFML sample related to the version of SFML detected
|
преди 11 години |