Michael Bonfils
69589afff7
Fix travis for Linux build
...
Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
2018-03-11 12:07:20 -04:00
d1838991a8
This is an attempt to fix the Travis build errors due to mismatched virtual override signatures
2018-03-03 18:44:27 -05:00
ed402040c9
Fix the fix for Mac
2018-03-03 18:19:18 -05:00
ee0bfa835a
Fix merge errors
2018-03-03 18:05:05 -05:00
9073063423
Merge branch 'merge_linux' of https://github.com/murlock/cboe
2018-03-03 17:52:59 -05:00
a0b61c1065
New VS2013 projectfile fixups
...
* Fix non-relative include paths for resources
* Fix one file path for the tests build
(Currently tests crash for me, but at least they do compile?)
* Remove old VS project junkfiles from gitignore
* Fix missing resource compiler include paths for Release builds
2018-03-03 17:41:29 -05:00
8ad20166e8
Merge pull request #179 from daerogami/moving2013proj
...
Moving vs2013 to 'proj' folder
Closes #178
2018-03-03 16:42:37 -05:00
Mark Clark
05711ec831
Removed copyfiles.bat and replaced functionality with MSBUILD targets;
...
Added 'gitinfo' NuGet package to replace need for bash to create gitrev.hpp;
Added preproccessor statement to prevent 'gitrev.hpp' from being referenced;
Re-ordered preproccessor definitions for easier diffing;
2018-02-25 23:30:13 -05:00
Mark Clark
942b102ed4
Corrected 'AdditionalIncludeDirectories' paths;
...
Corrected 'ForcedIncludeFiles' path;
2018-02-25 23:23:44 -05:00
Mark Clark
f81b6fd927
Fixed paths on all project source files;
2018-02-25 22:55:38 -05:00
Mark Clark
265f959ecf
Moved project;
2018-02-25 22:54:48 -05:00
be7ddb7948
Fixup README
2018-02-25 15:51:12 -05:00
282cc7b850
Fix VS2013 project
2018-02-25 15:48:09 -05:00
57c395379e
Merge pull request #176 from daerogami/proj-vs2017
...
Adding vs2017 project in new proj directory parallel to src
2018-02-25 15:38:55 -05:00
Mark Clark
a4f30e8c5c
Updated readme;
2018-02-25 15:20:06 -05:00
Mark Clark
d501c340d0
Tests project (with initial files and existing files, needs work);
2018-02-25 14:55:17 -05:00
Mark Clark
e70c360e11
Minor fixes to get build working for vs2017 project;
2018-02-25 14:55:13 -05:00
Mark Clark
cec4ca7a20
Added vs2017 project;
2018-02-25 14:55:10 -05:00
Mark Clark
4bba2ba691
Updated .gitignore to ignore new vs2017 solution artifacts;
2018-02-25 14:55:07 -05:00
e77d5194a3
Add a version directive to the shaders
2018-02-19 02:15:28 -05:00
17d87e87a7
Remove obsolete/unmaintained build files
2018-02-19 02:12:36 -05:00
8759aad90a
Move Xcode project to a separate tree parallel to src
2018-02-19 02:11:29 -05:00
827e1b2a6b
Fix crash when loading a saved game containing boats or horses
2018-02-18 17:33:12 -05:00
c21b0b8de7
Fix #155
2018-02-18 16:26:10 -05:00
516d5fff25
Remove references to removed outdoor size limits from the scenario creation dialog
2018-02-18 16:12:25 -05:00
03c19fa7ec
Use the new erase_completed_specials() function for towns too
2018-02-17 18:46:53 -05:00
e9490ac9d1
Rename a function
2018-02-17 18:45:45 -05:00
1d5e0c2e1e
Formatting
2018-02-17 18:14:38 -05:00
Mark Clark
b7d62067cc
Fixed issue where special could attempt accessing index outside range for specials;
2018-02-17 17:15:10 -05:00
Mark Clark
a2dc641f31
Refactored erase_out_specials();
2018-02-17 17:10:34 -05:00
05b6a9689f
Ignore the .vs directory from newer versions of MSVC.
2018-02-12 23:45:29 -05:00
5bc085facd
Ensure mathutil.hpp doesn't break in the presence of min/max macros
2018-02-12 23:36:30 -05:00
Eric Ahnell
709faf2c03
Fix broken links in README.md ( #62 )
...
2 links were affected by hard wrapping, unintentionally splitting them into two (broken) segments. This commit fixes that.
2018-02-11 15:42:38 -05:00
Michael Bonfils
12c3ce26f8
Fix compilation of linux
2018-02-10 17:08:33 +01:00
Michael Bonfils
d940f2c39d
Merge branch 'linux' into merge_linux
2018-02-08 20:36:46 +01:00
cb9f0eda53
Apply patches posted to the forums by Ir the Great
...
http://spiderwebforums.ipbhost.com/topic/22322-exile-remaster/?page=3&tab=comments#comment-300022
2017-12-16 16:52:00 -05:00
f3866861bb
Fix inability to duel-wield
...
(thanks to Ir the Great for this patch)
2017-12-16 16:51:27 -05:00
b0d2ca8e23
Fix possible crash on exiting scenario
...
(thanks to Ir the Great for this patch)
2017-12-16 16:37:59 -05:00
513d926032
Fix "Save" menu action not working (only "Save As" worked)
...
(thanks to Ir the Great for this patch)
2017-12-16 16:36:32 -05:00
3e2bf582de
Fix priest spells menu showing mage spells instead
...
(thanks to Ir the Great for the Windows side of this patch)
2017-12-16 16:34:01 -05:00
84f44820f8
Fix out-of-bounds issue when drawing boats and horses
...
(thanks to Ir the Great for spotting this issue)
2017-12-16 14:44:07 -05:00
6866ff7a98
Fix out-of-bounds traits error on Anama trait
...
(thanks to Ir the Great for this patch)
2017-12-16 14:40:18 -05:00
51c6bdd5ea
Minor scons improvements and fix an error in MinGW build
2017-09-16 22:36:43 -04:00
39f11dddb5
Fix scons+cl build
2017-09-16 13:12:36 -04:00
437b7127d8
Update NSI installer script to include the new-format scenarios,
...
instead of the old-format scenarios
2017-09-16 13:04:59 -04:00
db6132bb03
Fix MSVC warning in catch.hpp
2017-09-16 12:56:56 -04:00
0a98e62f14
Fix MSVC debug build
2017-09-16 12:54:04 -04:00
e53056a132
Fix a couple of MSVC compiler warnings
2017-09-16 12:46:42 -04:00
9127e4a03f
Enable building tests in MSVC 2013
2017-09-16 12:46:31 -04:00
477f6618fd
fixup 3582a05 for non-Windows
2017-09-04 23:41:40 -04:00
