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

7573 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
f1d07fb647 I no longer use CRTDBG to find bugs. Valgrind rules. 2016-10-29 10:53:18 +02:00
Enno Rehling
f17b6f2bb5 WIP: additional testing for GUARD. 
BUG: ents cannot guard, do not protect trees.
FIX: issue #589 (bad test for stardust)
 2016-10-28 20:26:34 +02:00
Enno Rehling
e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling
cf666f53a2 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-26 14:35:45 +02:00
Enno Rehling
91ae9245ca armedmen tests. 
check missing weapons, WTF_SIEGE and minskill
 2016-10-25 15:01:54 +02:00
Enno Rehling
97918799c1 additional testing for armedmen(). 2016-10-25 00:16:13 +02:00
Enno Rehling
8f802c11e1 off-by-one error for early break from loop. 2016-10-25 00:12:18 +02:00
Enno Rehling
7e8b54c996 Merge pull request #597 from ennorehling/develop 
FIX: glaciers made with snowglobes have no luxuries
 2016-10-24 14:02:18 +02:00
Enno Rehling
e5dc754c25 fix demand in broken regions, after load. 2016-10-24 13:54:53 +02:00
Enno Rehling
cd69936922 fix demand in terraformed regions. 
https://bugs.eressea.de/view.php?id=2249
 2016-10-24 13:47:38 +02:00
Enno Rehling
2fbc7a44d5 add missing tests for recent failures. 2016-10-23 13:02:53 +02:00
Enno Rehling
92e4643b72 Merge pull request #596 from ennorehling/develop 
duplicate curse ids
 2016-10-23 12:15:54 +02:00
Enno Rehling
a921a6594a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-23 10:03:46 +02:00
Enno Rehling
f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling
ac4e32a8f5 Merge branch 'master' into develop 2016-10-23 09:59:42 +02:00
Enno Rehling
bca90d2076 buildno.h is gone, don't try to read it. 2016-10-23 09:42:43 +02:00
Enno Rehling
34a6dd8d54 fix crash in 997: re-introduce cfindhash. 
this prevents duplicate curse.no values.
 2016-10-22 22:35:10 +02:00
Enno Rehling
c7ede945b3 use site packages on Travis CI, revert to Lua 5.1 2016-10-17 19:59:06 +02:00
Enno Rehling
641c1e1979 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-17 15:50:02 +02:00
Enno Rehling
f0fdb8d1a5 issue #594: temporary fix 2016-10-16 18:15:14 +02:00
Enno Rehling
f697e06d17 do not use tolua from package 2016-10-16 18:07:45 +02:00
Enno Rehling
edbfe686e7 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-16 17:31:05 +02:00
Enno Rehling
680c873844 Merge remote-tracking branch 'upstream/develop' into develop 2016-10-16 17:28:31 +02:00
Enno Rehling
06bfd2df5f Merge remote-tracking branch 'eressea/develop' into develop 2016-10-16 16:48:53 +02:00
Enno Rehling
919001fae0 do not rmdir tolua, we need it 2016-10-16 16:41:08 +02:00
Enno Rehling
0de30cd376 remove discontinued submodules if they are checked out 2016-10-16 11:58:42 +02:00
Enno Rehling
75422e1ba6 fix gcc conversion warnings 2016-10-09 10:07:05 +02:00
Enno Rehling
bf8d3b57b3 Merge branch 'develop' of github.com:eressea/server into develop 2016-10-09 10:01:36 +02:00
Enno Rehling
3d191b6573 not likely to get fixed 2016-10-09 10:01:31 +02:00
Enno Rehling
9287d0c1b4 unused function 2016-10-07 22:06:47 +02:00
Enno Rehling
38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling
fb470b7af1 re-organize lighthouse reporting. 2016-10-05 20:36:01 +02:00
Enno Rehling
5fe0503cd8 remove the unicode.h include from files that don't use it. 2016-10-05 16:43:14 +02:00
Enno Rehling
f9486b6c13 Merge pull request #592 from ennorehling/develop 
smaller optimizations
 2016-10-05 12:31:33 +02:00
Enno Rehling
f65bd3b079 disable logging of passwords. yikes 2016-10-05 09:28:23 +02:00
Enno Rehling
e79b36bc36 introduced a memory leak i last commit 2016-10-04 10:51:37 +02:00
Enno Rehling
61f76e6722 make old_race a little bit less awful. 2016-10-04 10:34:18 +02:00
Enno Rehling
9704002d2c Merge pull request #591 from ennorehling/develop 
minor optimizations
 2016-10-04 09:20:04 +02:00
Enno Rehling
3338f00fcb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-04 09:15:11 +02:00
Enno Rehling
d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling
63f60a2465 cache some more get_race calls, especially for RC_SPELL. 2016-10-03 20:36:46 +02:00
Enno Rehling
8f1a1fc8c3 tighten up some lookups. 2016-10-03 20:27:36 +02:00
Enno Rehling
fbdf845cb9 fix overpopulation-checks and movement based on splitsize. 2016-10-03 20:15:38 +02:00
Enno Rehling
26a416c5ba do not call can_survive all this much. 2016-10-03 16:38:17 +02:00
Enno Rehling
ef43aaa830 eliminate some duplicate calculations. 2016-10-03 16:28:18 +02:00
Enno Rehling
42e75007c3 little bit of refactoring and better variable names. 2016-10-03 16:26:40 +02:00
Enno Rehling
f6beda43f4 fix small typo 2016-10-03 16:16:17 +02:00
Enno Rehling
720b42b3c4 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-02 14:32:31 +02:00
Enno Rehling
879d791a60 seems like I forgot to commit this change, 
which is making the test fail. why only on my mac, though?
 2016-10-02 14:30:27 +02:00
Enno Rehling
1fe178f2ca Merge pull request #590 from ennorehling/develop 
Bug 2242: codepage conversion creates endless loop
 2016-10-02 13:23:32 +02:00