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

6677 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
7cda3f76a3 suppress valgrind report of stpncpy (why, drepper, why?) 2016-01-14 19:43:11 +01:00
Enno Rehling
68df8d53b8 msvc compile fix 2016-01-14 17:24:11 +01:00
Enno Rehling
2a75b2f086 Merge branch 'feature/crypt-passwords' of https://github.com/ennorehling/eressea into feature/crypt-passwords 2016-01-14 17:07:56 +01:00
Enno Rehling
6c80bc52b5 generate a good-ish salt 2016-01-14 16:50:42 +01:00
Enno Rehling
09be723c01 drepper code fixes 2016-01-14 15:55:53 +01:00
Enno Rehling
daf7420e4b fix gcc build 2016-01-14 15:53:48 +01:00
Enno Rehling
8d05f4cc25 implement MD5 crypted passwords as default 2016-01-14 15:49:09 +01:00
Enno Rehling
3a8a05380b fix gcc compilation warnings 2016-01-13 16:19:59 +01:00
Enno Rehling
c3da0cd42d as long as we use no encryption, all tests pass. 2016-01-13 16:16:02 +01:00
Enno Rehling
799514bf40 implement md5 password hashing (untested) 
disable test for case-insensitive password test
fix faction/checkpasswd test
 2016-01-13 14:41:09 +01:00
Enno Rehling
b8a0c61fee Merge branch 'feature/crypt-passwords' of https://github.com/ennorehling/eressea.git 2016-01-13 12:37:12 +01:00
Enno Rehling
f14ee2adaa include the password module in the list of unit tests 2016-01-13 12:37:07 +01:00
Enno Rehling
58b0ad19d0 NULL needs a platform-dependent include 2016-01-13 00:06:06 +01:00
Enno Rehling
54d25e91dd add a new password module 
start adding password hashing logic (WIP)
does not yet pass all tests
 2016-01-12 23:52:30 +01:00
Enno Rehling
ae0206652e passwords are write-only, cannot read them in tests 2016-01-12 07:25:57 +01:00
Enno Rehling
b6d44410b7 make the password pseudo-private to faction.c 2016-01-12 06:46:51 +01:00
Enno Rehling
dc6cc41d2d additional warnings 2016-01-12 02:27:22 +01:00
Enno Rehling
19390dd8e2 log a warning when passwords would fail for being case-sensitive. 
add a test to enforce the status quo, for now.
 2016-01-12 00:52:42 +01:00
Enno Rehling
b0b63747c4 Merge pull request #454 from ennorehling/feature/issue-451-destroyfaction-cleanup 
destroyfaction cleanup
 2016-01-11 18:54:21 +01:00
Enno Rehling
fadc92ee52 do not leak memory for factions that have died. 2016-01-11 18:17:24 +01:00
Enno Rehling
20063e0e0e fix errors in the order of cleanup 2016-01-11 18:03:53 +01:00
Enno Rehling
04e2fb73c7 fix test of allies status after destroying a faction 2016-01-11 15:08:36 +01:00
Enno Rehling
50eba2d308 I don't really believe that this is going to work, but let's see where it fails. 2016-01-11 14:59:25 +01:00
Enno Rehling
04624179ce make destroyfaction not have to loop over all factions to clear HELP status. 2016-01-11 14:42:36 +01:00
Enno Rehling
8742317979 hack: do not free faction when we destroy it (issue #451) 2016-01-11 14:01:55 +01:00
Enno Rehling
05c53735c6 Merge pull request #453 from eressea/issue-451-destroyfaction 
Issue 451 destroyfaction
 2016-01-11 13:46:53 +01:00
Enno Rehling
43801f8951 Merge pull request #452 from ennorehling/issue-451-destroyfaction 
smarter handling of faction.alive
 2016-01-11 12:44:53 +01:00
Enno Rehling
ca500a499e adding a much-needed getter function for faction_alive 2016-01-11 12:25:23 +01:00
Enno Rehling
b4389c91fe fix compilation (what was I thinking?), remove uses of f.alive where they should not be needed. 2016-01-11 11:54:45 +01:00
Enno Rehling
de512be1ba make destroyfaction remove the faction from the list (slightly scary change) 2016-01-11 09:55:47 +01:00
Enno Rehling
7d426dc3ed call destroyfaction instead of free as a quick fix 2016-01-10 12:07:00 +01:00
Enno Rehling
4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +01:00
Enno Rehling
b8a474db27 release version 3.7.8 2016-01-01 16:37:56 +01:00
Enno Rehling
c5c0a590a2 Merge branch 'master' of github.com:eressea/server 2016-01-01 16:37:31 +01:00
Enno Rehling
4907073208 Merge pull request #450 from ennorehling/xmas_messages 
Error messages and tests for snowglobe (master)
 2016-01-01 16:37:06 +01:00
Enno Rehling
25966b3d7f add tests for snowglobe error messages 2016-01-01 16:30:09 +01:00
Enno Rehling
2c7790af9c Merge pull request #445 from stm2/dragon_move 
make dragon movement more deterministic
 2015-12-31 21:16:56 +01:00
Enno Rehling
4fca656df3 Merge pull request #448 from stm2/config_tweak 
fixing booleans in config
 2015-12-31 21:16:20 +01:00
Enno Rehling
4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Enno Rehling
e7c23b15db add missing files 2015-12-30 21:22:28 +01:00
Enno Rehling
e1f3b3cdcf passing order object into lua use-functions, so we can use them in error messages. 2015-12-30 21:20:59 +01:00
Steffen Mecke
bd5d3376d5 fixing booleans in config 
see cf08cdf3fb
 2015-12-30 14:05:42 +01:00
Steffen Mecke
1aca1c6a87 fix logic bug 2015-12-30 14:04:10 +01:00
Enno Rehling
14afee6093 Merge pull request #447 from TurnerSE/feature/xmas2015 
Feature/xmas2015 iteminfo
 2015-12-30 11:25:20 +01:00
Philipp Dreher
18f2cc1d70 cosmetic changes to iteminfo of skillpotion 2015-12-29 09:43:30 +01:00
Philipp Dreher
7b2aa821d0 Added iteminfo for snowglobe in DE+EN 2015-12-29 09:42:54 +01:00
Enno Rehling
2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling
1dc69bb1e8 release version 3.7.7 2015-12-26 14:40:47 +01:00
Enno Rehling
e574919555 Merge branch 'master' of github.com:eressea/server 2015-12-26 14:40:21 +01:00
Enno Rehling
899738a93c Merge pull request #446 from ennorehling/xmas 
xmas item 2015
 2015-12-26 11:49:37 +01:00