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

6751 Commits

Author SHA1 Message Date
Enno Rehling 91f894b290 teleport.c is the astral space implementation, and it is not one of the core concepts, so move it out of the kernel/ directory 2016-01-28 12:25:16 +01:00
Enno Rehling 2f70054d2f braineaters outside of astral sapce lose 50% of their innate magic resistance. 2016-01-28 10:58:28 +01:00
Enno Rehling e516f2d630 Merge pull request #460 from ennorehling/feature/bug-2180-warnings 
bug 2180: eliminate warnings
 2016-01-24 15:05:06 +01:00
Enno Rehling fa130d9ce5 make all the rset-asserts look the same 2016-01-24 14:57:36 +01:00
Enno Rehling cc4367f1b7 borken merge fix 2016-01-24 14:55:43 +01:00
Enno Rehling a66e81e90d Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/region.c
 2016-01-24 14:55:05 +01:00
Enno Rehling 5072d59636 release version 3.7.9 2016-01-24 14:51:52 +01:00
Enno Rehling c4ad655456 Merge pull request #459 from ennorehling/master 
Workaround and additional assertions for bug 2182
 2016-01-24 14:50:54 +01:00
Enno Rehling a6b15813ed relax strict assertion (should be allowed to set ocean to 0 peasants) 2016-01-24 14:45:46 +01:00
Enno Rehling 023686fab2 add a liberal sprinkling of assertions to catch negative peasants bug 2182 2016-01-24 14:35:46 +01:00
Enno Rehling 3d7b22fa21 avoid crashing because of bug 2182 2016-01-24 14:31:24 +01:00
Enno Rehling 6286100350 github issue #458, valgrind reports uninitialized data 2016-01-24 14:21:14 +01:00
Enno Rehling b646c9e22e duplicate definition of concealing_aura in E3 2016-01-24 11:44:18 +01:00
Enno Rehling b6b452c77b Make this error a warning instead, Eternath is over. 
Disable Eternath in E2.
 2016-01-24 11:07:07 +01:00
Enno Rehling c2e837e826 deprecated module, turn error into warning 2016-01-21 12:34:55 +01:00
Enno Rehling 2b0a2750ba null-pointer check (coverity result) 2016-01-17 19:03:30 +01:00
Enno Rehling 52e517b98d Merge branch 'master' into develop 2016-01-17 16:23:01 +01:00
Enno Rehling b75b25c046 add suppressions for bugs in valgrind vs libc on our debian system 
this fixes issue #456
 2016-01-17 16:10:39 +01:00
Enno Rehling 6a4bee28d0 Merge pull request #455 from ennorehling/feature/crypt-passwords 
Kein feedback bekommen, Schade eigentlich. Dann werde ich das mal mergen und hoffen, dass es im preview funktioniert (3.8 kommt ja bald).
 2016-01-15 18:38:06 +01:00
Enno Rehling 0e30f392c4 Merge branch 'feature/crypt-passwords' of https://github.com/ennorehling/eressea.git 2016-01-15 08:54:56 +01:00
Enno Rehling 76475b9bf7 add a little extra randomness to the seed salt (still bad). 
remove dead prototype code from faction.c
 2016-01-15 08:01:12 +01:00
Enno Rehling 568e1a2976 prevent null-pointer crash when reading f.password (TODO: write-only variables are dumb) 2016-01-14 21:23:53 +01:00
Enno Rehling 4fb453863d Merge branch 'feature/crypt-passwords' of https://github.com/ennorehling/eressea into feature/crypt-passwords 2016-01-14 20:05:28 +01:00
Enno Rehling 7cda3f76a3 suppress valgrind report of stpncpy (why, drepper, why?) 2016-01-14 19:43:11 +01:00
Enno Rehling 09a0e806bc gcc compilation fix 2016-01-14 17:29:20 +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