 David Wimsey
|
c206d604f0
Fixed OSX Lua build architecture setting
|
11 years ago |
|
David Wimsey
|
defcb96479
Fixed inclusion of Debugger.h and Controls.h
|
11 years ago |
|
David Wimsey
|
cb99d6caa7
Minor tweak for framework builds
|
11 years ago |
|
David Wimsey
|
6151829b79
Minor fixes for merged code
|
11 years ago |
|
David Wimsey
|
2d4d614195
Merge branch 'feature/osx-framework' of https://github.com/dwimsey/libRocket into feature/osx-framework
|
11 years ago |
|
David Wimsey
|
0fc8d68db9
Merge pull request #196 from libRocket/hotfix/193-sample-resize-bug
|
11 years ago |
|
David Wimsey
|
f39e6f063e
Quick fix for issue #193
|
11 years ago |
|
David Wimsey
|
da2a0dcaba
Merge pull request #170 from feature/directx10-example
|
11 years ago |
|
David Wimsey
|
d2e1ad9837
Merge pull request #192 from dwimsey/feature/gitignore-build-artifacts
|
11 years ago |
|
David Wimsey
|
deb3c25fcd
Adding dependencies directory, python and lua scripting modules, and some remaining Windows build artifacts to ignore list
|
11 years ago |
|
David Wimsey
|
7f18d2bf01
Added dependencies search path for Lua includes and library
|
11 years ago |
|
David Wimsey
|
cfc40c41e7
Merge pull request #190 from dwimsey/feature/lua-scripting
|
11 years ago |
|
David Wimsey
|
579dce51f3
Various fixes to sync Lua scripting with recent updates
|
11 years ago |
|
David Wimsey
|
b7107c140c
Merge pull request #187 from dwimsey/feature/cmake-cleanup-projectfiles
|
11 years ago |
|
David Wimsey
|
e9618bce7c
Removed project files from Samples
|
11 years ago |
|
David Wimsey
|
6a351c1efe
Merge pull request #186 from libRocket/feature/scan-dependencies-dir
|
11 years ago |
|
David Wimsey
|
4ef3367d27
Merge pull request #185 from libRocket/feature/lua-scripting
|
11 years ago |
|
David Wimsey
|
a170f13da5
Merge branch 'feature-use-existing-lua-context' of https://github.com/dwimsey/libRocket into feature/lua-scripting
|
11 years ago |
|
David Wimsey
|
19d2cccd45
Added error checking to LoadFile to catch NULL pointer errors when the file specified can not be loaded or is empty
|
11 years ago |
|
David Wimsey
|
dcb7b7f33e
Minor fixes for clarity
|
11 years ago |
|
David Wimsey
|
e148bd5dfc
Merge branch 'master' of http://github.com/Gambini/libRocket into feature/lua-scripting
|
11 years ago |
|
David Wimsey
|
43ff3b4da9
Merge pull request #182 from dwimsey/feature/cmake-cleanup-projectfiles
|
11 years ago |
|
David Wimsey
|
0e51dc62f0
Regenerated based on latest gen_filelists.sh update, includes appropriate .inl files
|
11 years ago |
|
David Wimsey
|
1978757990
This file is unreferenced and is a duplicate of Source/Core/Pool.inl, where it is referenced only by Pool.h and no public headers.
|
11 years ago |
|
David Wimsey
|
1d0ef7cc1c
Adds .inl files to file list, this will ensure they are copied as required to the appropriate installation directories as well as insure that CMake rebuilds the project when these files are changed
|
11 years ago |
|
David Wimsey
|
c4f4331603
Minor update to references in README.TXT to include DirectX 10 reference
|
11 years ago |
|
David Wimsey
|
6f17a257a6
Merge pull request #171 from dwimsey/feature/python-with-static-librocket
|
11 years ago |
|
David Wimsey
|
03ff27b5c0
Initial support for building framework bundles, use BUILD_FRAMEWORK=ON
|
11 years ago |
|
David Wimsey
|
c5ffdf1b40
Fix for minor typo resulting in uninitialized member m_pScissorTestEnable
|
11 years ago |
|
David Wimsey
|
2dab43bc3d
Merge commit '29b735301c8ef0246c9d85add1ec57385cf5377a' into feature/directx10-example
|
11 years ago |
