32 Commits

Author SHA1 Message Date
Stephen E. Baker
c81ba258cf Bump vcpkg for May 2025 2025-05-23 10:52:19 -04:00
Stephen E. Baker
d707e53310 Add more ignore files / directories
clangd and kdevelop
2024-11-01 17:35:26 -04:00
Stephen E. Baker
e37b2675c9 Extend ignore to cover .vs directories 2024-02-18 13:45:01 -05:00
Alexandre Lavoie
38f90e3ba9 Nixpkgs Implementation (and Docker Improvement) (#1881)
* Fix  Dockerfile would not complete due to interactivity being enabled.
* Added docker-compose.yml to build with `docker-compose up`.
* Removed Lua 5.2 from Dockerfile.
* Add BUILD_CORSIXTH cmake flag for disabling building the main program, e.g. if you only want AnimView
2021-06-02 17:01:27 -04:00
Stephen E. Baker
4a1c98a716 [RDY] Cpp fmt (#1562)
* Hand formatted changes before automatic formatting

* Break up / shorten some long lines

* Add some missing braces for clarity

* Multiline strings are merged to let clang-format split them
appropriately.

* sdl_core's frame_count changed from a C style array to std::array
which made the length checks simpler.

* Add includes and forward declairs to avoid transitive dependencies

* Remove th_gfx_font.h include from th_gfx.h - circular dependencies

* using to shorten lines in th_map.cpp

* Avoid non-portable reinterpret_cast for parcels in th_map.

* Use more constants in th_map.

* Use class initializer for th_map classes

* Add clang files to ignore list

* Add clang-format file

* Reformat all files with clang-format

Also includes some manual braces.

* Disable clang-format for backdrop.h

* Clang-format AnimView src files

* clang-format common code

* Fix anonymous struct in union warning

Anonymous structs in anonymous unions are not supported by the standard.

* Check clang-format in travis

* Bin pack parameters

* Bin pack arguments too

* Full Google style

2 space indent, no forced break on braces.

* A couple format overrides

Order of usings in config.h.in since 8 is smaller than 16.
Table layout, since 0x80 nicely fits in 8 columns.
2019-10-06 08:18:25 -04:00
Stephen E. Baker
9e2409e2e1 Use lowercase name corsix-th on unix.
Apple still uses the same name, but on other UNIX systems the all
lowercase name is preferred.
2018-02-08 21:30:49 -05:00
Stephen E. Baker
f9f272099d Specify data dir for msvc
Allow CorsixTH to run from MSVC in out of source builds by specifying the path
to CorsixTH.lua
2018-02-01 07:34:26 -05:00
Pavel Schoffer
8b7e9d6626 Issue 1321: Adds default build path to .gitignore 2018-01-08 20:03:36 +01:00
David Fairbrother
9a59d7ada0 PR feedback - whitespace and gitignore 2017-12-21 01:59:47 +00:00
David Fairbrother
5f48447e10 Add capture mouse option to in game menu
Adds the toggle to capture the mouse to the
ingame menu. Also added the CorsixTH binary
to the .gitignore file
2017-12-20 22:21:03 +00:00
David Fairbrother
104aa3f879 Add VSCode and Eclipse files to gitignore 2017-12-20 22:11:36 +00:00
David Fairbrother
ef0c23866d Add script to build and package libs in MS vcpkg
This commit adds a new script which can be executed on
a Windows machine to build and package the libraries
for CorsixTH. A new folder called vcpkg will be created
in the same folder as the script. The script is
integrated into CMake and run by default when
targetting MSVC.
2017-11-10 21:41:30 -05:00
David Fairbrother
7ad371f57e Use CMake to pull in and use precompiled deps for Linux
This commit adds a new module which clones and automatically sets
the include and library paths for the precompiled dependencies.

Linux users can opt in however they must choose the final arch
(i.e. x86 or x64) they intend to compile against.
2017-11-10 21:35:21 -05:00
Stephen E. Baker
f8f6d92b74 Remove AnimView generated file from source.
VSPR-0.XML is generated by AnimView and should not be included in source
control.
2016-07-05 14:18:44 -04:00
timdiels
1a9405e6af Generate documentation for CorsixTH with make doc
Generate reference doc for CorsixTH, AnimView, LevelEdit, MapEdit with doxygen.
Allow LDocGen to generate documentation in any working directory.
Upload documentation to web with TravisCI.

Corrections to the original pull request contributed by:
Alberth <alberth289346@gmail.com>
2015-04-15 19:45:08 -04:00
William Gatens
650598c85c Merge pull request #668 from TheCycoONE/ignore_build
Ignore all folders in the root with names starting with build
2015-03-20 22:34:44 +00:00
Stephen E. Baker
74e09428b3 Merge pull request #439 from J-Shep/DBGp_Support
Added support for Lua DBGp Debugging such as Eclipse debugging
2015-02-18 20:09:30 -05:00
J-Shep
c09aefbcd5 Added Lua debugger support via DBGp
To support this CorsixTH simply needs to have "debugger.lua" and a
"dofile('debugger')()" call to it in order to start & then connect
a lua DBGp client for CorsixTH to a running Lua DBGp server.

The call for executing debugger.lua's returned DBGp client starting
function is located in the new run_debugger script so that this script
can be executed by CorsixTH.lua before App.lua is executed, when the new
--connect-lua-dbgp CorsixTH.exe startup argument is used.

Alernatively a DBGp client can be started after the App class has taken
control of CorsixTH by calling App:connectDebugger() using its "Debug"
drop down menu command or its CTRL + C global key handler.

debugger.lua is a 3rd party Lua script and therefore won't be distributed
with CorsixTH so developers will have to download it into their Lua
directory when setting up a computer for CorsixTH Lua DBGp debugging.

This commit also makes the debug console and debug script executing
key commands usable anywhere in CorsixTH along with its added command.
2015-02-17 14:51:42 +00:00
Stephen E. Baker
e91fae07d5 Remove some unused/obsolete files from CorsixTH
CorsixTH.deproj is a Decoda project file. No one is maintaining it.
I opened it recently and found it was not at all complete.

CorsixTH.aps is a Visual Studio auto generated file which should not
have been included in source control.
2015-02-16 21:04:46 -05:00
Stephen E. Baker
63d5bba3a2 Ignore all folders in the root with names starting with build
This allows using cmake to set up multiple build folders without showing
up in the git status using folder structures like:
/build-luajit
/build-libav
or
/builds/luajit
/builds/libav
2015-02-05 20:18:17 -05:00
JASheppard
d142dde26f New Dev Menu Option: "(Shift+D) Run Debug Script"
This new option uses loadfile() to execute: ../lua/debug_script.lua

So instead of using the debug console developers can now edit and
execute this file in their programming IDE while CorsixTH is running,
using the underscore global variable to refer to clicked entities
2014-07-28 10:22:22 +01:00
Jørgen P. Tjernø
e7c5018661 Update gitignore to catch more cmake cruft. 2014-04-19 13:40:50 -07:00
Joseph Sheppard
e072c13f1e .gitIgnore: added VS Express user config file (*.suo)
CorsixTH.v12.suo is generated by Visual Studio Express 2013 to store a
user's configuration.
2014-02-13 21:42:05 +00:00
Joseph Sheppard
f960c57939 .GitIgnore amendments 2014-02-06 18:24:51 +00:00
Edvin Linge
7883ca0c58 Updated .gitignore file 2013-10-09 19:16:42 +02:00
Edvin Linge
3ff011d811 Had some fun with the Level Editor. Removed the dependency on MiGLayout by creating my own Panel instead. Tried to change as little as possible of the existing code, there should be no functionality changes except for one small thing: The warning text in the population tab did not update when you removed an entry, now it does. Also added what to write in the command line to compile and run the Level Editor, and added some more files to the ignore file 2013-09-07 10:30:58 +02:00
Edvin Linge
5e003675b6 Ugly commit that
1. Adds the MIT license to the LevelEdit source files.
2. Changes tabs into spaces to use the same standard as our C++ files.
3. Moved the files into a package.

Even though it might look like it there has been no changes to the actual code.
2013-09-01 09:19:10 +00:00
Jørgen P. Tjernø
88de1bf91c Updated ignores. 2013-08-25 11:53:23 -07:00
Edvin Linge
682a56a78d Added some cmake files to the svn:ignore list. See issue 1293 for more details. 2012-09-16 15:40:28 +00:00
Peter Cawley
90607de4bb Moved config.txt to config.sample.txt, so that personal changes to config.txt shouldn't get accidentally committed to SVN. 2010-02-21 22:30:41 +00:00
Peter Cawley
9f8ed1f4a5 Added CMake scripts for AnimView and MapEdit (patch by haicovanroeden in issue 114).
Various improvements to the CMake scripts (patches by haicovanroeden and vittorio giovara in issues 114 and 115).
Fixed incorrect OpenGL header inclusion on MacOS / OS X (patch by vittorio giovara in issue 115).
Fixed some compiler warnings.
2010-01-15 21:17:42 +00:00
Peter Cawley
bb3ae474ec Added sound archive loading.
Fixed AnimView not compiling with latest stable wxWidgets release.
2009-09-19 14:41:35 +00:00