Enno Rehling
|
2b0a2750ba
|
null-pointer check (coverity result)
|
2016-01-17 19:03:30 +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
|
09a0e806bc
|
gcc compilation fix
|
2016-01-14 17:29:20 +01:00 |
Enno Rehling
|
6c80bc52b5
|
generate a good-ish salt
|
2016-01-14 16:50:42 +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
|
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
|
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
|
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
|
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
|
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
|
1aca1c6a87
|
fix logic bug
|
2015-12-30 14:04:10 +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
|
b66b6f7f4c
|
testing christmas items, removing old xmas scripts
|
2015-12-22 19:33:44 +01:00 |
Enno Rehling
|
cf90f8cf93
|
it's beginning to look a lot like christmas
Conflicts:
scripts/eressea/xmas.lua
|
2015-12-22 18:46:57 +01:00 |
Enno Rehling
|
3fd4884584
|
putting all of the pieces together for the snow globe, with final use implementation still TBD
Conflicts:
scripts/eressea/xmasitems.lua
src/laws.c
|
2015-12-22 18:46:42 +01:00 |
Enno Rehling
|
55c15c1905
|
add a lua binding to convert user-language strings to directions
|
2015-12-22 18:38:12 +01:00 |
Enno Rehling
|
1f080e2058
|
release version 3.7.6
|
2015-12-20 20:17:10 +01:00 |
Enno Rehling
|
c9d74ee6ca
|
Merge branch 'master' of github.com:eressea/server
|
2015-12-20 20:13:15 +01:00 |
Enno Rehling
|
810ad094af
|
suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels
|
2015-12-18 15:13:15 +01:00 |
Enno Rehling
|
30acc38d53
|
https://bugs.eressea.de/view.php?id=2174
fix terrain type in detectocean message.
|
2015-12-17 20:36:21 +01:00 |
Enno Rehling
|
18c0c235db
|
Merge pull request #440 from ennorehling/feature/bug-2176-reduceproduction
bug 2176, reduceproduction message im CR
|
2015-12-17 13:17:00 +01:00 |
Enno Rehling
|
beb12372e0
|
remove wormhole_data struct now that it's nearly empty
|
2015-12-17 13:10:09 +01:00 |
Enno Rehling
|
9d1b5dccb8
|
resolve a TODO by reducing wormhole data size
|
2015-12-17 13:04:51 +01:00 |
Enno Rehling
|
74d8b53ba8
|
fix a TODO, reduce size of icastle_data
|
2015-12-17 12:59:12 +01:00 |
Enno Rehling
|
a02d71bfef
|
https://bugs.eressea.de/view.php?id=2176
generate the reduced production message before writing reports, so it shows in the CR.
|
2015-12-17 12:40:22 +01:00 |
Enno Rehling
|
9e4344e3c3
|
resolve a TODO, make attribute (and data) a little bit smaller.
|
2015-12-17 12:23:07 +01:00 |
Steffen Mecke
|
09836ed249
|
make dragon movement more deterministic
|
2015-12-17 11:47:08 +01:00 |
Enno Rehling
|
5187788f3c
|
pass the parent of an attribute into a_age and attrib_type::age
|
2015-12-16 22:18:44 +01:00 |
Enno Rehling
|
d85123fe8b
|
Merge pull request #439 from ennorehling/develop
MS Visual Studio 2015 update 1 breaking changes
|
2015-12-16 17:06:04 +01:00 |
Enno Rehling
|
fadccb5bd6
|
MS Visual Studio 2015 update 1 breaking changes (relative include files)
|
2015-12-16 17:02:29 +01:00 |
Enno Rehling
|
c66d6c7457
|
Address MS Visual Studio 2015 update 1 breaking changes
|
2015-12-16 17:01:47 +01:00 |
Enno Rehling
|
24f559b4ad
|
Address MS Visual Studio 2015 update 1 breaking changes
|
2015-12-16 16:55:52 +01:00 |
Enno Rehling
|
fa55f84b41
|
remove unnecessary assert that prevents throwing away money on an ocean
github issue #437
https://bugs.eressea.de/view.php?id=2173#c6411
|
2015-12-16 13:32:02 +01:00 |
Enno Rehling
|
3fafb04b57
|
fix ahort to int converaion problems, fox PR
|
2015-12-11 18:03:55 +01:00 |
Steffen Mecke
|
ad74c0a25d
|
fix rare bug that created negative peasants
when a region had non-standard wage, immigration could cause negative peasants
|
2015-12-08 17:57:23 +01:00 |
Steffen Mecke
|
1f4c521ac8
|
encapsulate r->land->peasants, money, horses, herbs, morale
|
2015-12-08 17:57:23 +01:00 |
Steffen Mecke
|
723c3df7b2
|
test for immigration
|
2015-12-08 17:57:23 +01:00 |
Steffen Mecke
|
703edb676c
|
facility to inject a non-random random generator
This should be handy for writing tests that make use of randomization.
|
2015-12-08 17:57:23 +01:00 |
Enno Rehling
|
1a9e3db423
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
|
2015-12-06 20:51:14 +01:00 |
Enno Rehling
|
44024878f9
|
Merge branch 'master' of github.com:eressea/server
|
2015-12-06 20:50:06 +01:00 |
Enno Rehling
|
9b7d4adda5
|
https://bugs.eressea.de/view.php?id=2173#c6397
by request: magic resistance never higher than 90%, so highly skilled monsters cannot become completely invincible to magic.
|
2015-12-06 20:48:22 +01:00 |
Enno Rehling
|
acf3aaad5a
|
release version 3.7.5
|
2015-12-06 18:44:31 +01:00 |
Enno Rehling
|
1075b7ce17
|
Merge branch 'master' into develop
|
2015-12-06 18:39:54 +01:00 |
Enno Rehling
|
d04d8e782e
|
https://bugs.eressea.de/view.php?id=2173
rewrite the rules for magical damage reduction
|
2015-12-06 18:34:31 +01:00 |
Enno Rehling
|
b854213be6
|
Merge pull request #429 from ennorehling/develop
break_curse spell description error message
|
2015-12-06 16:53:04 +01:00 |
Enno Rehling
|
6a20345b53
|
issue #428, fix writing spell description for break_curse
|
2015-12-06 16:45:31 +01:00 |
Enno Rehling
|
65902ca97f
|
do not call a function test_* that is not a test (I got confused and broke it when trying to make a change)
|
2015-12-06 12:02:16 +01:00 |
Steffen Mecke
|
864c875316
|
fix typo: fiery breath was icy
|
2015-12-05 22:27:03 +01:00 |
Enno Rehling
|
435d801239
|
fix compiation problems after merge
what is going on with this? why was critbit outdated?
|
2015-12-05 18:45:03 +01:00 |
Enno Rehling
|
1d57bf527d
|
Merge branch 'master' into develop
Conflicts:
src/battle.test.c
src/buildno.h
|
2015-12-05 17:27:04 +01:00 |
Enno Rehling
|
bf2920d1ae
|
fix warnings on gcc
|
2015-12-05 17:25:47 +01:00 |
Enno Rehling
|
62ee1468b8
|
https://bugs.eressea.de/view.php?id=2166
* fix magic resistance calculation in calculate_armor.
* add related tests.
* refactor BF_CANATTACK -> BF_NO_ATTACK because it is easier.
|
2015-12-05 17:17:21 +01:00 |
Enno Rehling
|
3e048e2a84
|
Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139
Conflicts:
scripts/tests/e3/castles.lua
scripts/tests/e3/rules.lua
|
2015-12-03 11:06:55 +01:00 |
Enno Rehling
|
b3e7fa63e0
|
Merge pull request #396 from stm2/spell_parameters
fixed treatment of spell parameters (bug 1867)
|
2015-12-03 11:04:57 +01:00 |
Enno Rehling
|
e91310f576
|
Merge pull request #422 from ennorehling/feature/issue-418-seaserpent-piracy-crash
issue #419, eliminate language_struct.h, make the struct module-private
|
2015-12-02 11:52:16 +01:00 |
Steffen Mecke
|
e3d7d23d00
|
re-enable sea serpent piracy
|
2015-12-01 22:30:51 +01:00 |
Steffen Mecke
|
9c076ba6b9
|
fix piracy_cmd for swimmers and flyers
|
2015-12-01 22:13:20 +01:00 |
Enno Rehling
|
9b645bf46c
|
issue #419, eliminate language_struct.h, make the struct module-private
|
2015-12-01 12:24:22 +01:00 |
Enno Rehling
|
70354a355b
|
disable piracy for sea serpents, piracy_cmd cannot handle it (issue #418)
|
2015-12-01 12:22:03 +01:00 |
Steffen Mecke
|
eae87bc7f1
|
fix null pointer access, bug2169
|
2015-11-29 21:06:35 +01:00 |
Enno Rehling
|
4b7cb824bd
|
Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload
Conflicts:
src/move.c
src/tests.c
|
2015-11-27 12:40:17 +01:00 |
Enno Rehling
|
950bf91850
|
fix merge conflict in PR #397 (config changes)
|
2015-11-26 18:48:21 +01:00 |
Enno Rehling
|
6ad5db8e22
|
Merge pull request #397 from stm2/taxing_message
taxing without skill does not fail silently any more
|
2015-11-26 18:43:57 +01:00 |
Enno Rehling
|
0410581907
|
Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests
Conflicts:
src/move.test.c
src/study.c
|
2015-11-26 18:42:23 +01:00 |
Steffen Mecke
|
fe49f01bb6
|
added moa tests for buildingtype_exists
|
2015-11-25 23:25:59 +01:00 |
Enno Rehling
|
6c2f4be4af
|
fix sea serpents using piracy (by re-ordering the decision making process)
|
2015-11-25 15:29:26 +01:00 |
Enno Rehling
|
90b0bdd44e
|
re-enable all monster tests except piracy for seaserpents, which is red.
|
2015-11-25 14:53:29 +01:00 |
Enno Rehling
|
1cf805649e
|
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
src/monsters.c
src/monsters.test.c
|
2015-11-25 14:38:26 +01:00 |
Enno Rehling
|
c85e489f4f
|
Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers
Conflicts:
src/kernel/unit.c
src/laws.test.c
src/monsters.c
|
2015-11-25 14:25:42 +01:00 |
Enno Rehling
|
b6bb5dee85
|
fix last merge to work with new config code
|
2015-11-25 13:27:44 +01:00 |
Enno Rehling
|
677f7eac0a
|
Merge branch 'master' into develop
Conflicts:
src/move.c
|
2015-11-25 13:25:36 +01:00 |
Enno Rehling
|
4e4a11d40c
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-25 12:06:22 +01:00 |
Enno Rehling
|
f301bec623
|
addressing comments by solthar on bug 2164, PR #408: storms should still cause damage to ships.
cleaning up some configuration lookups in sail, moving them outside of loops.
|
2015-11-25 12:04:09 +01:00 |
Enno Rehling
|
f559c263e3
|
cleanup of config.c: move more code to other modules like unit.c and faction.c
|
2015-11-24 19:53:27 +01:00 |