Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
4419 commits 10 branches 0 tags 41 MiB
Commit graph

55 commits

Author SHA1 Message Date
Enno Rehling
04845526ca fix missing keywords for GIVE 2014-06-17 18:00:01 -07:00
Enno Rehling
33928568cf finally have all the scaffolding to write a test with ships. 
configure terrain flags from json.
ships are always allowed to enter SEA regions.
 2014-06-16 22:19:19 -07:00
Enno Rehling
0af5e96e3a Renaming keyword tokens to English. 2014-06-16 20:16:06 -07:00
Enno Rehling
27374a9329 put keywords into a namespace before giving them english keys (tbd). 2014-06-16 18:45:32 -07:00
Enno Rehling
d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling
fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling
e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling
038ba723ef remove old equipment file from config everywhere 2014-06-01 23:57:45 +02:00
Enno Rehling
41c6b13111 familiars with differnt skills for different games 2014-05-10 13:50:16 -07:00
Enno Rehling
86bc4e7aef reading and writing the NPC flag was broken, because flags were a fully loaded unsigned int. making it an int instead, and adding a test. 
fixing a bad test in which shadowmasters were deserting to faction null (causing a crash).
 2014-05-05 19:11:40 -07:00
Enno Rehling
0c06c86fb9 do not kill the wrong nonstarters 2014-04-24 23:36:54 -07:00
Enno Rehling
35c2baafbe do not read turn file for turn 0 2014-04-25 07:47:23 +02:00
Enno Rehling
0a0d70bb1d fix recruiting tests. peasant growth is too random to calculate. 
add current critbit module
 2014-03-17 06:47:57 +01:00
Thomas Troeger
33b68ecc19 - moved test for bug 1738 to better location. 2014-03-16 23:17:48 +01:00
Thomas Troeger
5b86fcb744 - added test to reproduce bug 1738. 2014-03-16 23:16:40 +01:00
Enno Rehling
ace886a2d3 added a test for saving/loading descriptions (bug 1984). 
added bindings for ship descriptions.
fixed test framework, so make test will show failures in lua.
 2014-03-02 10:55:35 -08:00
Enno Rehling
03c247c788 I am killing the core/ directory. 
Lots of files are moving to a new location in src/
Some intersting CMake changes.
 2014-02-18 05:45:00 +01:00
Enno Rehling
5cf31189e6 remove obsolete unity build 
I used to speed up compilation by reducing the number of compilation
units with this hack. It's no longer done this way, so let me kill the
supporting files here.
 2014-02-17 11:25:53 -08:00
Enno Rehling
b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling
3db9fcf82f Rename some German symbols to English. 
I felt like I needed to make a commit today.
 2014-02-17 02:20:54 -08:00
Enno Rehling
8e611d759d eliminate intellisense warnings. 
OCD kind of stuff. Visual Studio complains about these, but they aren't
really anything severe.
 2014-02-16 13:48:07 -08:00
Thomas Troeger
59d5c1e94f added missing case for `AT_DRAIN_EXP' (bug 1514). 
added assert that triggers if a unit has no faction.
 2014-02-16 04:12:31 +01:00
Enno Rehling
55b1a9038c fix this test to work in E2 and E3 2014-02-16 03:24:23 +01:00
Enno Rehling
cb23d88a2e add a test for bug 1514, proving that shadowmaster display is broken 2014-02-16 03:06:56 +01:00
Enno Rehling
2e626be090 add a test to make sure that elvenhorses require riding 5 2014-02-16 00:51:43 +01:00
Enno Rehling
138e0dcc40 add a test to check that demons eat peasants 2014-02-15 23:09:18 +01:00
Enno Rehling
1594c7a71b fix a bug in the lua binding for writing a single unit 2014-02-15 23:08:48 +01:00
Enno Rehling
6ff110ae36 add a configuration option to stop peasant growths, for testing 2014-02-15 23:08:11 +01:00
Enno Rehling
29124b92e2 Bug 1984: length of ship description is longer than a name, size buffer 
appropriately.
 2014-02-06 10:45:52 +01:00
Enno Rehling
e0ce8877a5 increase buffer size for descriptions to 8K. http://bugs.eressea.de/view.php?id=1984 2014-01-05 19:13:06 -08:00
Enno Rehling
0f0cda214f fix http://bugs.eressea.de/view.php?id=1983 
message-type hashes were not initialized.
 2014-01-05 12:50:13 -08:00
Enno Rehling
99151e209b type conversion binds stronger than trinary operator 2014-01-04 20:15:16 +01:00
Enno Rehling
b214fc10cc Merge branch 'master' of github.com:eressea/server 2014-01-02 22:08:15 -08:00
Enno Rehling
5af91b21aa compile on VS2010, without C11 2014-01-02 22:00:52 -08:00
Enno Rehling
6412d3bbf8 remove the fallback password. 2014-01-01 20:29:08 -08:00
Enno Rehling
3660c47afb remove os.[hc] in favor of generated config.h 
new cmake files to find lua
 2014-01-01 19:14:26 +01:00
Enno Rehling
4a08cdd23e repair UTF8 order parsing 
probably broke the old latin1 parsing, but who cares?
 2013-12-31 09:27:42 -08:00
Enno Rehling
96b3e302be fix a bug reading gamedata 
n is not a loop variable, it is purely for use as a temporary here.
 2013-12-31 08:37:17 -08:00
Enno Rehling
07a57fadaa fix gcc errors, mostly reading unsigned values. 2013-12-31 10:29:00 +01:00
Enno Rehling
77ab9133c2 use the storage submodule everywhere. 
make most magic use float instead of double.
 2013-12-31 01:06:28 -08:00
Enno Rehling
1b88d13e75 fixing library dependencies and include paths 2013-12-31 09:05:52 +01:00
Enno Rehling
30b3911637 eliminate strdup 
The POSIX name for this item is deprecated. Instead, use the ISO C++
conformant name: _strdup.
 2013-12-29 05:38:58 -08:00
Enno Rehling
4a5d2d8de9 successfully builds on win32. 
Fixed a bug in pdcurses and rearranged includes to make MOUSE_MOVED
macro and bool type not conflict with builtins.
 2013-12-29 05:12:48 -08:00
Enno Rehling
478f900b7d fixing up what my last commit broke, so it compiles on a regular linux again. 
platform.h needs some cleanup.
 2013-12-29 09:31:49 +01:00
Enno Rehling
a112dc908e do not emit that MSVC warning. 
fix a missing include.
 2013-12-29 00:21:10 -08:00
Enno Rehling
6521fed160 fix some bad includes. 
start removing the cfopen function.
move a function that was only used in textstore.c.
 2013-12-29 00:19:22 -08:00
Enno Rehling
25328d2a62 fix curses compilation underncurses. 
will have to devise some other hack to fix windows
 2013-12-29 08:38:19 +01:00
Enno Rehling
a2d6881f61 fix use of curses on windows. 
workaround for curses defining its own boolean type.
 2013-12-28 22:58:39 -08:00
Enno Rehling
e3934fe675 Merge branch 'master' of github.com:eressea/server 2013-12-29 01:24:55 +01:00
Enno Rehling
9b49bbd387 fix crash in a spell when no astral space is available. 2013-12-29 00:15:50 +01:00