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

4531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
cf4e081179 nobody ever profited from castle bonuses 2011-03-09 14:49:50 +01:00
Enno Rehling
ff51fe6493 added meropis buildings 
also fixed a bug that prevented tests with ATTACKs to be executed properly (NewbieImmunity)
 2011-03-09 14:49:43 +01:00
Enno Rehling
fa69da6de2 added missing move_test.c 2011-03-09 11:01:40 +01:00
Enno Rehling
c08fba8308 fix the morale test, needs to update_owners() first. 2011-03-08 21:21:11 -08:00
Enno Rehling
5bf42bd8e9 make laws_tests more stand-alone 2011-03-08 21:18:35 -08:00
Enno Rehling
e01c6bb8b1 make merge request sing with Eressea 
added a missing file (move_test.c)
changing the way tests are included
making some lua code prettier (too many parens)
 2011-03-08 21:06:38 -08:00
Enno Rehling
7fc1b4ae8c fixed two bugs: harbours were not unique and multiple instances of unique buildings could still be built 2011-03-09 00:28:37 +01:00
Enno Rehling
8714957a61 fixed two bugs: harbours were not unique and multiple instances of unique buildings could still be built 2011-03-09 00:28:37 +01:00
Enno Rehling
d65d03db9c fixed oops with __cplusplus 2011-03-09 00:28:37 +01:00
Enno Rehling
54d05f8544 MSVC warns about unreachable code. 2011-03-07 23:46:56 -08:00
Enno Rehling
f406767eeb compiling with -pedantic on linux 2011-03-08 08:44:20 +01:00
Enno Rehling
b4c5607747 compiling with -pedantic on linux 2011-03-08 08:44:20 +01:00
Enno
b95f663087 compiling with -pedantic on linux 2011-03-08 08:42:31 +01:00
Enno Rehling
04b3d7ff45 use enums, fix typecasts 2011-03-07 22:31:06 -08:00
Enno Rehling
f41eb5c836 compile with -ansi and -pedantic 2011-03-07 22:30:32 -08:00
Enno Rehling
496aa22e65 fixes for -ansi -pedantic 2011-03-07 17:29:19 +01:00
Enno Rehling
78b7dcd727 more indentation cleanup 2011-03-06 23:40:55 -08:00
Enno Rehling
791e4cd673 fix CRLF massacre 2011-03-07 08:35:23 +01:00
Enno Rehling
610c6799ea fix CRLF massacre 2011-03-07 08:31:59 +01:00
Enno Rehling
01acb1e7f6 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno Rehling
9c8779b303 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno
d940f29a6c indentation rules, slightly updated 2011-03-07 08:24:48 +01:00
Enno Rehling
9f539b8c12 CRLF confusion? 2011-03-06 23:07:04 -08:00
Enno
347a888b67 indentation rules, strictly applied 2011-03-07 08:03:10 +01:00
Enno Rehling
27e435850e indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling
fb7a642d47 indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling
7a983c80cf * there are no boats 
* skill should only use 4 bytes
 2011-03-06 22:06:30 -08:00
Enno Rehling
763d134b9f Make all tests for Eressea pass again, using the config module. 2011-03-06 21:49:01 -08:00
Enno Rehling
1be42e9d50 Make all tests for Eressea pass again, using the config module. 2011-03-06 21:49:01 -08:00
Enno Rehling
fb94908014 export resources and shiptypes as part of configuration. 2011-03-06 21:12:55 -08:00
Enno Rehling
36e53069e0 use quicklist to store ship types. 2011-03-06 21:11:17 -08:00
Enno Rehling
3677e899af Do not assert on unknown skills, but log them as an error. 2011-03-06 19:56:20 -08:00
Enno Rehling
d75ee1a057 Make the code compile on Visual Studio again, fixing type conversion warnings and C99-isms. 
Signed-off-by: Enno Rehling <enno@eressea.de>
 2011-03-06 19:29:20 -08:00
Enno Rehling
e8910e5a72 Merge commit 'refs/merge-requests/2' of git://gitorious.org/eressea/server into merge-requests/2 2011-03-06 19:14:45 -08:00
Enno
6286c3212d more copyable Makefile 2011-03-06 21:01:30 +01:00
Enno Rehling
75998e0949 Makefile so it's easier to one-step build this 2011-03-06 17:41:14 +01:00
Enno Rehling
d672510f06 two little remarks 2011-03-06 12:43:39 +01:00
Enno Rehling
a1af328950 added Atlantis ship types 2011-03-06 12:43:18 +01:00
Enno Rehling
623c0dce84 empty ships sink 2011-03-06 12:43:18 +01:00
Enno Rehling
cb4f7a03c6 configurable ship damage 2011-03-06 12:43:18 +01:00
Enno Rehling
8c42643528 added Atlantis ship types 2011-03-06 12:43:18 +01:00
Enno Rehling
8c129f1576 skill.id had wrong type 2011-03-05 19:39:02 +01:00
Enno Rehling
53aec0d438 do not silently fail on unknown skill 2011-03-05 19:39:02 +01:00
Enno
b7c323f0c9 whitepsace change to test buildbot 2011-03-05 04:56:59 +01:00
Enno
8e650ce4e9 an equals operator on these would be neat 2011-03-05 04:49:08 +01:00
Enno
d58d90b853 sometimes we need a Makefile to be happy 2011-03-05 04:17:02 +01:00
Enno Rehling
02921d0148 removed all unused items 2011-03-04 20:44:30 +01:00
Enno Rehling
b0f1445d68 removed all unused items 2011-03-04 20:44:30 +01:00
Enno Rehling
a11d49b406 added a parenthesis to remove a warning 2011-03-04 20:44:30 +01:00
Enno Rehling
258b33e639 updates windows after search 2011-03-03 15:10:20 +01:00