Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,062 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

7062 Commits

Author SHA1 Message Date
Enno Rehling 33d1521bfd pass the parent of an attribute into a_age and attrib_type::age 2016-02-20 16:50:04 +01:00
Steffen Mecke 22367249db fix morale change when region owner changes 
http://bugs.eressea.de/view.php?id=2139

Conflicts:
	scripts/tests/e3/castles.lua
 2016-02-20 16:42:18 +01:00
Enno Rehling 29c9e719da eliminate plane.watchers feature 
. we don't use them anywhere
. they have no tests
. they crash readgame when watchers have died
 2016-02-18 08:48:54 +01:00
Enno Rehling 57085ea47b gcc fix, disable test properly 
TBD:plane.watchers
 2016-02-18 08:11:39 +01:00
Enno Rehling 9f62e74a37 add a test to check that destroyfaction updates the alliance leader. 
clean up save.test.c a bit.
disable failing test temporarily.
 2016-02-17 14:06:59 +01:00
Enno Rehling a6fe697c7a tests for read/write of triggers that reference factions, with bugfixes. 2016-02-17 13:55:48 +01:00
Enno Rehling 325a0ccbf1 write a test that proves the bug in turn 966 2016-02-17 09:24:19 +01:00
Enno Rehling 4050f994a4 fix write_faction_reference, check for f->alive in other places 
TODO:
1. I added some new TODOs
2. What happens to morale when region owners die?
3. Needs tests
 2016-02-16 07:30:26 +01:00
Enno Rehling 9829a58174 Merge pull request #482 from ennorehling/master 
E2 turn 966 desaster fix
 2016-02-13 22:32:27 +01:00
Enno Rehling 95092a8085 disable intermittent test. see issue #477 2016-02-13 22:23:12 +01:00
Enno Rehling b0be24245b disable intermittent test. see issue #477 2016-02-13 22:21:34 +01:00
Enno Rehling 54e4b7a508 E2 turn 966 desaster: code was writing a bad datafile 2016-02-13 22:07:51 +01:00
Enno Rehling 5317c029d5 fix key upgrade. 
should have had a test to begin with.
github issue #481
 2016-02-13 21:38:42 +01:00
Enno Rehling 9c10cc6b16 fix linux build 2016-02-13 13:56:49 +01:00
Enno Rehling 9c7dd13ac9 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2016-02-13 13:27:40 +01:00
Enno Rehling ec216643c3 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-02-13 07:28:36 +01:00
Enno Rehling b4323c4a3c unused variable 2016-02-13 07:27:21 +01:00
Enno Rehling 40530f2066 rename to password_encode, streamline tests 2016-02-12 08:33:08 +01:00
Enno Rehling c0c6d19be2 bcrypt hashes implementation, not activated yet. 2016-02-12 07:16:45 +01:00
Enno Rehling 64937fac3a do all password checks with EPasswd 2016-02-11 20:39:56 +01:00
Enno Rehling 57ae38dec5 add scripts for fetching report by email 2016-02-11 20:27:41 +01:00
Enno Rehling b18f048e1e install procmail rules in share 2016-02-11 11:41:19 +01:00
Enno Rehling 6d8d55ef09 filter invalid lines for mime parser' 2016-02-11 11:22:32 +01:00
Enno Rehling b031efaba5 add gruenbaer procmail rules to git 2016-02-11 11:12:23 +01:00
Enno Rehling 2d99a999dc add the real orders-accept script 2016-02-11 11:08:51 +01:00
Enno Rehling f4642ce82b Merge pull request #476 from ennorehling/master 
script installation
 2016-02-10 23:21:38 +01:00
Enno Rehling 84a6e7a498 include process directory in install process, clean up install script 2016-02-10 23:06:41 +01:00
Enno Rehling 844bbde0aa Merge pull request #475 from ennorehling/master 
generate htpasswd files, understand apr1 hashes in confirmation script
 2016-02-10 14:23:13 +01:00
Enno Rehling 88f3a46142 generate htpasswd files, understand apr1 hashes in confirmation script 2016-02-10 14:12:38 +01:00
Enno Rehling d361622008 password module 2016-02-10 13:42:53 +01:00
Enno Rehling 3fd7a3c486 Merge branch 'develop' of github.com:eressea/server into develop 2016-02-10 13:41:09 +01:00
Enno Rehling bb44126652 password checking module 2016-02-10 13:40:57 +01:00
Enno Rehling 337aaa18e4 Merge pull request #473 from ennorehling/develop 
attribute storage: reduce datafile size by 5%
 2016-02-10 11:28:49 +01:00
Enno Rehling 01e864273a crash with an assert if Lua code has syntax errors. 
this addresses issue #474
also, correct capitalization of Lua.
 2016-02-09 21:34:24 +01:00
Enno Rehling 91ca77bc48 passwd is no longer written 2016-02-09 18:34:36 +01:00
Enno Rehling 3ee023cdd6 it was all a lua syntax error. good grief. that should go to stderr! 2016-02-09 18:30:42 +01:00
Enno Rehling 50f22d7c2f debug output 2016-02-09 18:20:01 +01:00
Enno Rehling ca6448ec23 re-enable failing valgrind check with more flags 2016-02-09 17:18:09 +01:00
Enno Rehling 652136ee46 unused variable, kill 2016-02-09 16:32:01 +01:00
Enno Rehling 5f2dc192db disable test because valgrind is complaining 2016-02-09 16:11:32 +01:00
Enno Rehling 87aa7c887e fix build 2016-02-09 14:08:36 +01:00
Enno Rehling 997d81e34a memcpy is in string.h 2016-02-09 13:56:57 +01:00
Enno Rehling b6e2fc28df remove unused functions 2016-02-09 13:56:15 +01:00
Enno Rehling 188aa84011 create htpasswd files after the turn. do not overwrite old password file (E2!) 2016-02-09 08:42:24 +01:00
Enno Rehling 1201a6b739 unused variable, bad version check 2016-02-09 07:06:07 +01:00
Enno Rehling 5e631fd145 replace at_key with at_keys, some bugs found by tests. 2016-02-09 07:03:11 +01:00
Enno Rehling dbcae5484e update test to check more than one key and cleanup. 2016-02-09 06:45:46 +01:00
Enno Rehling 0189111876 update key attribute api 
prepare to replace at_key. do not return the internals. add basic test.
 2016-02-09 06:43:19 +01:00
Enno Rehling abc3caa6d1 optimized storage of attribs. 
save the hash instead of the name and save a few bytes.
 2016-02-09 00:28:23 +01:00
Enno Rehling f630278339 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-06 23:27:13 +01:00