Enno Rehling
|
fe29e29c31
|
fix -Wconversion for move.c
|
2015-05-15 06:43:47 +02:00 |
Enno Rehling
|
9c7fe1d7cc
|
fix gcc compilation and missing argument
|
2015-05-13 13:12:46 +02:00 |
Enno Rehling
|
a46d60aa97
|
enable -Wconversion on gcc/clang builds
fix some of the warnings coming out of that for battle.c
|
2015-05-13 03:17:30 -07:00 |
Steffen Mecke
|
ab1376d212
|
trying to test curse_write/read
|
2015-05-13 12:05:45 +02:00 |
Enno Rehling
|
06ff88e783
|
use filestream for report_template, too.
|
2015-05-12 20:51:17 -07:00 |
Enno Rehling
|
53a452e4ba
|
more conversions to filestream
|
2015-05-12 20:08:34 -07:00 |
Enno Rehling
|
e048b82ad2
|
very messy first steps towards making report_plaintext use filestream instead of FILE (lots of hacks)
|
2015-05-12 19:41:43 -07:00 |
Enno Rehling
|
9b9e038438
|
press F3 to save game in editor.
|
2015-05-12 17:18:51 -07:00 |
Enno Rehling
|
3574d4a0b9
|
fix a Visual Studio /Wall warning
|
2015-05-12 00:12:58 -07:00 |
Enno Rehling
|
bf5fae2ef5
|
Fix visual studio compilation for Solthar's curse changes (float/int conversions, uninitialized variable).
|
2015-05-11 23:54:21 -07:00 |
Enno Rehling
|
a4de46dab5
|
Merge pull request #181 from stm2/missing_curse_name
fix crash of Analyze Magic (mantis bug 2099)
|
2015-05-10 19:49:57 -07:00 |
Enno Rehling
|
7f1ee527d9
|
Merge pull request #186 from badgerman/develop
newplayer script updates, small gmtool fixes
|
2015-05-10 14:05:39 -07:00 |
Enno Rehling
|
dc0897b122
|
fix gmtool and setup script to match the GM guide document.
|
2015-05-10 13:41:48 -07:00 |
Enno Rehling
|
628af4f6ad
|
Merge pull request #182 from stm2/dreams_fix
refactoring + tests for good/bad dreams
|
2015-05-08 09:37:22 -07:00 |
Steffen Mecke
|
2d27442681
|
apply possible number of racial attacks consequently
|
2015-05-08 13:02:54 +02:00 |
Steffen Mecke
|
d9f8479055
|
removed duplication in good/bad dreams code
|
2015-05-07 17:54:59 +02:00 |
Steffen Mecke
|
dedf9f2009
|
clear CURSE_ISNEW explicitly in age(), not implicitly in write/read
|
2015-05-07 17:51:43 +02:00 |
Steffen Mecke
|
553cf23e9e
|
crash more gracefully on missing description
|
2015-05-07 17:51:38 +02:00 |
Steffen Mecke
|
231f9bb39a
|
check for existence of spell descriptions
|
2015-05-07 13:31:19 +02:00 |
Steffen Mecke
|
b41049da53
|
test good/bad dreams
|
2015-05-06 18:15:10 +02:00 |
Enno Rehling
|
03084a7ee7
|
set_origin: renaming German function name to English, add a simple test for it.
|
2015-05-05 09:47:44 -07:00 |
Enno Rehling
|
42783ff02c
|
binding a magician's spellbook to Lua, with test.
|
2015-05-05 08:44:58 -07:00 |
Enno Rehling
|
0db74d1c09
|
re-enable unit spells binding to Lua, remove some TODOs from the code.
|
2015-05-05 08:07:20 -07:00 |
Steffen Mecke
|
0fc7364533
|
fixed errors introduced by rebase
|
2015-05-04 14:46:32 +02:00 |
Steffen Mecke
|
79d2c76c3f
|
refining spy tests
|
2015-05-04 14:30:59 +02:00 |
Steffen Mecke
|
d4aa6e834e
|
check for number of arguments as good as possible and cleaning up test
|
2015-05-04 14:30:59 +02:00 |
Steffen Mecke
|
e28222c5be
|
fix missing kampfstatus
|
2015-05-04 14:30:59 +02:00 |
Steffen Mecke
|
2cc8c1f871
|
trying to solve spy message bug #1604
Conflicts:
src/kernel/CMakeLists.txt
|
2015-05-04 14:30:59 +02:00 |
Enno Rehling
|
fe3d96517e
|
Merge pull request #178 from stm2/typ
Tippfehler und englische Texte für Health.
|
2015-05-03 23:12:01 +02:00 |
Steffen Mecke
|
a9a14a79d0
|
fixed messed up english strings for wounds
|
2015-04-30 15:47:29 +02:00 |
Enno Rehling
|
ce94c9805d
|
rules.give.max_men == -1 für unlimitierte Übergaben in E2
|
2015-04-28 17:40:41 +02:00 |
Enno Rehling
|
30e4dc6cdc
|
Fix keepitem flag in XML ("Menschen geben nichts ab")
|
2015-04-22 12:33:55 +02:00 |
Enno Rehling
|
88d370a7b8
|
fixing sea serpent names
https://bugs.eressea.de/view.php?id=2057
|
2015-04-21 12:35:39 +02:00 |
Enno Rehling
|
d2fbdec831
|
re-enable disabled tests for E2, add test for FOLLOW.
|
2015-04-20 15:07:10 +02:00 |
Enno Rehling
|
f06e3371a0
|
Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff.
|
2015-04-19 12:49:39 +02:00 |
Enno Rehling
|
71d0558403
|
Bug 2089: remove the giveitem restriction from all races.
https://bugs.eressea.de/view.php?id=2089
|
2015-04-19 09:49:52 +02:00 |
Enno Rehling
|
6e9fca5e2f
|
allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept.
|
2015-04-19 08:36:15 +02:00 |
Enno Rehling
|
3e1ae5e0f2
|
allow reading of JSON_REPORT_VERSION from future source release
|
2015-04-19 08:13:40 +02:00 |
Enno Rehling
|
93e79fcf8f
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-04-17 16:33:30 +02:00 |
Enno Rehling
|
961f5e8445
|
Merge branch 'develop' of github.com:badgerman/eressea into develop
|
2015-04-17 16:32:53 +02:00 |
Enno Rehling
|
743ea02331
|
test_peasantluck_effect fails on my atom netbook
|
2015-04-14 03:09:52 +02:00 |
Enno Rehling
|
ae9fb399f3
|
unit tests walkingcapacity, configurable trollbelt effect
|
2015-04-14 02:32:01 +02:00 |
Enno Rehling
|
a5da77c376
|
Merge pull request #168 from badgerman/hotfix-3-4-5
tests for volcanooutbreak and spyreport messages
|
2015-04-10 11:13:44 +02:00 |
Enno Rehling
|
d2eac946f1
|
ALLY command crashes when incomplete.
|
2015-04-09 17:16:34 +02:00 |
Enno Rehling
|
b9a41bc39f
|
fixing the trollbelt multiplier.
it was multiplying the weight of the unit, too, leading to far too big bonuses.
https://bugs.eressea.de/view.php?id=1510
|
2015-04-09 15:59:00 +02:00 |
Enno Rehling
|
f68be23f69
|
damage taken in the first round of combat does not cause ships to get flagged for damage.
|
2015-04-09 14:30:49 +02:00 |
Enno Rehling
|
ad0a753c52
|
CLAIM command did not like that tokens could be NULL.
|
2015-04-09 12:33:23 +02:00 |
Enno Rehling
|
224a9af33c
|
Test "guarding makes ATTACK a short command"
https://bugs.eressea.de/view.php?id=1493
expose unit.guard values to Lua
|
2015-04-09 12:19:17 +02:00 |
Enno Rehling
|
82926318c0
|
fix creating factions with invalid race (return nil)
|
2015-04-04 15:08:35 +02:00 |
Enno Rehling
|
9664f2b191
|
Implement an optional JSON report writer. Currently writes readable maps for Tiled.
|
2015-03-29 14:03:56 +02:00 |
Enno Rehling
|
d802b297e9
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-03-19 15:31:33 +01:00 |
Enno Rehling
|
9b64269b6d
|
fix auto-study plus-equal typo
|
2015-03-19 15:31:25 +01:00 |
Enno Rehling
|
a2a0bbad6a
|
bug 2068: select familiars by race of mage, not faction.
https://bugs.eressea.de/view.php?id=2068
|
2015-03-13 22:14:01 +01:00 |
Enno Rehling
|
4d18fe68f8
|
gcc language purity complaint.
|
2015-03-13 21:56:18 +01:00 |
Enno Rehling
|
293190703f
|
make maximum number of people transferred to a faction configurable
make E2 transfers basically unlimited.
|
2015-03-13 21:10:39 +01:00 |
Enno Rehling
|
8edafa19c5
|
fix faction.create locale handling
|
2015-03-13 20:39:36 +01:00 |
Enno Rehling
|
0b3190605a
|
increase build number: silver weight enabled again, fix keyword crash
|
2015-03-07 14:15:25 +01:00 |
Enno Rehling
|
eb282eecb1
|
fix keyword-buffer overflow
|
2015-03-07 14:15:12 +01:00 |
Enno Rehling
|
4ce2429276
|
fix keyword-buffer overflow
|
2015-03-04 22:19:11 +01:00 |
Enno Rehling
|
2175dd4e0e
|
Merge branch 'master' of github.com:eressea/server
|
2015-03-02 23:12:26 +01:00 |
Enno Rehling
|
76cce7f239
|
fix terrible code to avoid gcc 4.9 warning
|
2015-03-02 23:12:20 +01:00 |
Enno Rehling
|
1ec7a68b07
|
fix terrible code to avoid gcc 4.9 warning
|
2015-03-02 23:12:02 +01:00 |
Enno Rehling
|
3ee07a795d
|
somehow broke region.c, cannot explain how that happened
|
2015-02-23 15:53:55 +01:00 |
Enno Rehling
|
e2421b3fe7
|
make lua errors show up on stderr, always (log_fatal).
this could have been prettier. log.c could use some loving.
|
2015-02-23 02:47:08 +01:00 |
Enno Rehling
|
60366ccb06
|
Merge pull request #153 from eressea/hotfix-3-4-5
merge changes from hotfix 3.4.5 into develop
|
2015-02-22 22:38:53 +01:00 |
Enno Rehling
|
b68e2a983e
|
added tests to make sure volcanooutbreak and spyreport are no longer empty messages.
|
2015-02-22 22:31:50 +01:00 |
CTD
|
53241bc95f
|
Guard chance repaired
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
|
2015-02-22 21:45:11 +01:00 |
Enno Rehling
|
ea580a2836
|
Merge pull request #140 from stm2/heroes_recruit
fix heroes must not recruit
|
2015-02-16 22:37:44 +01:00 |
Steffen Mecke
|
78d4d2fc1b
|
add test for hero recruits
|
2015-02-16 20:44:03 +01:00 |
CTD
|
58fae8e90d
|
Guard chance repaired
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
|
2015-02-15 18:27:54 +01:00 |
Enno Rehling
|
f6e37bd875
|
bump build number
|
2015-02-15 18:27:26 +01:00 |
CTD
|
a78cabd5a0
|
Guard chance repaired
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
|
2015-02-13 16:22:52 +01:00 |
Steffen Mecke
|
d416a8eef1
|
fix NAME FOREIGN UNIT
RENAME FOREIGN UNIT used a somewhat naive approach to check if a
unit still had its generic name. Fixed that.
|
2015-02-11 23:10:43 +01:00 |
Steffen Mecke
|
a31898ceb5
|
fix bug in generic_name, minor improvements
Amusingly, names::generic_name used u->no instead of u->number to determine
singular or plural.
|
2015-02-11 23:10:27 +01:00 |
Enno Rehling
|
6f2b122f18
|
Merge pull request #142 from badgerman/bug-1802-unitname
Bug 1802: unit names do not show up in CR
|
2015-02-11 18:32:55 +01:00 |
Enno Rehling
|
83e610ee03
|
Fixing bug 1802 again, CR contains no Monster names.
|
2015-02-11 07:57:38 +01:00 |
Steffen Mecke
|
b5f8be8a95
|
fix heroes must not recruit
|
2015-02-10 18:17:58 +01:00 |
Steffen Mecke
|
d6500f7e4f
|
fix bug in tests introduced by previous merge
|
2015-02-09 10:57:03 +01:00 |
Enno Rehling
|
7b41a53d2a
|
Merge branch 'master' into setup-cronjob
Conflicts:
src/buildno.h
|
2015-02-08 13:56:49 +01:00 |
Enno Rehling
|
e85c1778eb
|
Merge pull request #136 from badgerman/hotfix-3.4.2
Fix broken syntax in message about effects on units.
|
2015-02-08 13:44:17 +01:00 |
Enno Rehling
|
30f5fbd4ca
|
work around gcc being nervous when static functions are unused.
|
2015-02-08 13:42:04 +01:00 |
Enno Rehling
|
39806eaef5
|
disable broken test_luck_message for now.
|
2015-02-08 13:37:44 +01:00 |
Enno Rehling
|
a2e071d35b
|
Fix broken syntax in message about effects on units.
Add some missing descriptions.
Bump version number.
|
2015-02-08 13:09:04 +01:00 |
Enno Rehling
|
d7804b3556
|
Merge branch 'hotfix-3.4.1' of https://github.com/badgerman/eressea into badgerman-hotfix-3.4.1
Conflicts:
src/buildno.h
src/tests.c
|
2015-02-08 10:50:31 +01:00 |
Enno Rehling
|
954a649d3f
|
version number bump
|
2015-02-08 10:41:05 +01:00 |
Enno Rehling
|
f9bced467d
|
fix a crash in rename_cmd
|
2015-02-08 10:33:45 +01:00 |
Enno Rehling
|
84da00f62d
|
increase version number for develop branch
|
2015-02-06 01:42:12 +01:00 |
Enno Rehling
|
6953ad4403
|
Merge branch 'develop' of github.com:eressea/server
|
2015-02-06 01:40:51 +01:00 |
Enno Rehling
|
fecbac86bc
|
update version number, make preview script use the correct branch
|
2015-02-06 01:40:03 +01:00 |
Enno Rehling
|
e0cb2c9332
|
add a test for json configuration leaving the ship alone if it has no data.
|
2015-02-03 17:13:30 +01:00 |
Enno Rehling
|
605711c13a
|
constructor st_get_or_create sets ship_type to default values
xmlreader does not mess with values already set.
|
2015-02-03 17:10:29 +01:00 |
Steffen Mecke
|
d288c74aaf
|
fix stork message (mantis 2027), add tests
|
2015-02-02 21:32:29 +01:00 |
Enno Rehling
|
faf61ae4d2
|
Merge branch 'stork_fix' of https://github.com/stm2/server into stm2-stork_fix
|
2015-02-02 20:20:44 +01:00 |
Enno Rehling
|
a4e6f4874c
|
building type construction is in bt_get_or_create, and only there.
+ not in jsonconf
+ not in xmlreader (no test for this)
|
2015-02-02 19:52:24 +01:00 |
Enno Rehling
|
0955dd7f05
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
|
2015-02-02 18:49:00 +01:00 |
Steffen Mecke
|
5ff0596517
|
fix stork message (mantis 2027), add tests
|
2015-02-01 19:14:06 +01:00 |
Enno Rehling
|
136230f51b
|
Merge pull request #124 from badgerman/master
add a configuration switch to disable force_leave (bug 2059) for now.
|
2015-02-01 13:01:04 +01:00 |
Enno Rehling
|
01b46b143b
|
add a configuration switch to disable force_leave (bug 2059) for now.
|
2015-02-01 12:57:54 +01:00 |
Enno Rehling
|
89598dd987
|
Merge pull request #110 from stm2/bug1973
cr_report should also check if region messages can be heard (bug #1973)
|
2015-02-01 12:28:17 +01:00 |
Enno Rehling
|
9a395127ac
|
Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix
Conflicts:
src/report.c
|
2015-02-01 12:24:19 +01:00 |
Enno Rehling
|
03cddee6b7
|
Small plural/singular fix in German message.
|
2015-02-01 10:39:36 +01:00 |
Enno Rehling
|
3fc434e1b9
|
bug 2072: make peasant growth not spam messages.
|
2015-02-01 10:27:00 +01:00 |
Enno Rehling
|
da9c33268c
|
fix preview crash in embassies.lua.
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
|
2015-02-01 10:03:30 +01:00 |
Enno Rehling
|
5e0c934c6f
|
indentation fixes for this new file
|
2015-01-30 22:30:11 +01:00 |
Enno Rehling
|
02f92f7932
|
Merge branch 'stm2-peasantgrowth_acceleration'
|
2015-01-30 22:25:21 +01:00 |
Enno Rehling
|
df5ab02689
|
Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration
|
2015-01-30 22:11:10 +01:00 |
Enno Rehling
|
c54cbfd472
|
fix copyright notice
|
2015-01-30 22:10:29 +01:00 |
Enno Rehling
|
a97a7bbf1d
|
Merge branch 'master' of github.com:eressea/server
Conflicts:
src/kernel/item.test.c
|
2015-01-30 20:44:42 +01:00 |
Steffen Mecke
|
5e4ea5a145
|
fixed formatting errors
|
2015-01-30 20:43:40 +01:00 |
Enno Rehling
|
abca25d1d5
|
fix indentation in every file
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
|
2015-01-30 20:37:14 +01:00 |
Steffen Mecke
|
a97b211e70
|
bit of testing, code improvements, formatting
|
2015-01-30 18:25:56 +01:00 |
Steffen Mecke
|
4c391ae6f6
|
implemented Enno's suggestions for peasant growth
|
2015-01-29 23:55:02 +01:00 |
Enno Rehling
|
633a356928
|
Merge pull request #117 from stm2/mallorncursemessage
mallorn spell used wrong error message
|
2015-01-29 21:58:43 +01:00 |
Enno Rehling
|
c3ed521d4f
|
Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4
Conflicts:
src/laws.c
|
2015-01-29 18:03:21 +01:00 |
Enno Rehling
|
c7b28e7b39
|
disable ORIGIN at the source, prevent gcc warnings.
|
2015-01-29 16:46:03 +01:00 |
Enno Rehling
|
2260a19d50
|
disable ORIGIN command because of E4 crash
|
2015-01-26 07:24:18 +01:00 |
Enno Rehling
|
7bfb14b4e6
|
Resolve naming confusion, rename object and bind_hashtable.
They implement a dict-style thing, so let's call it that.
|
2015-01-17 13:34:48 +01:00 |
Enno Rehling
|
dadf7734a5
|
set defaults in the race constructor, add test.
|
2015-01-15 17:17:58 +01:00 |
Enno Rehling
|
9f542e081b
|
fix last commit, broke the gcc travis build.
|
2015-01-15 17:17:32 +01:00 |
Enno Rehling
|
490782e750
|
add some simple tests for messages, prior to any refactorings.
|
2015-01-15 16:40:19 +01:00 |
Steffen Mecke
|
531ab0e7a2
|
add configuration parameters for peasant growth and peasant luck effect
|
2015-01-15 13:34:50 +01:00 |
Steffen Mecke
|
ec6560a281
|
adding a nice region message
|
2015-01-15 03:48:19 +01:00 |
Steffen Mecke
|
863901d482
|
putting faster version into effect and removing pseudo-test
|
2015-01-15 02:53:15 +01:00 |
Steffen Mecke
|
51d52aaf7f
|
implementing a much faster version of peasant growth calculation
|
2015-01-15 02:53:15 +01:00 |
Enno Rehling
|
6fb23af66a
|
test that ships are encumbered by money. define money in XML, not just in code.
|
2015-01-14 17:56:12 +01:00 |
Steffen Mecke
|
3433ffd1bc
|
cr_report should also check if region messages can be heard (bug #1973)
|
2015-01-14 16:24:22 +01:00 |
Steffen Mecke
|
039ee159cb
|
a bunch of messages in the NR where not localized
|
2015-01-14 16:17:21 +01:00 |
Enno Rehling
|
468882f974
|
test that money has weight, add weight in init_resources (TODO: use the config files).
|
2015-01-14 07:46:42 +01:00 |
Steffen Mecke
|
dff34f8e92
|
increase speed of peasant growth calculation
|
2015-01-14 01:55:04 +01:00 |
Steffen Mecke
|
e6538439fb
|
mallorn spell used wrong error message
|
2015-01-14 01:54:55 +01:00 |
Enno Rehling
|
73e1632dee
|
Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave
Conflicts:
src/laws.c
src/laws.test.c
|
2015-01-13 07:48:46 +01:00 |
Enno Rehling
|
4f2d9260d1
|
add a message to the unit that gets kicked, with tests
|
2015-01-13 07:43:30 +01:00 |
Enno Rehling
|
f52e00d574
|
do not eject units from a ship when on the ocean.
|
2015-01-13 07:32:24 +01:00 |
Enno Rehling
|
698aa5e99a
|
Bug 2059: building owners kick out anyone they don't HELP GUARD.
|
2015-01-13 07:32:23 +01:00 |
Enno Rehling
|
838cf3d938
|
try to allow visual studio to build with all warnings (/WAll) enabled.
|
2015-01-12 22:53:21 +01:00 |
Enno Rehling
|
2ddd5d242a
|
Merge branch 'master' of github.com:badgerman/eressea
|
2015-01-12 20:25:09 +01:00 |
Enno Rehling
|
2aac2daf56
|
fix the castle bonus PR so it can pass gcc.
|
2015-01-12 20:23:25 +01:00 |
Enno Rehling
|
e897b667f6
|
Merge branch 'Burgen_Bonus_configurierbar' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-Burgen_Bonus_configurierbar
|
2015-01-12 20:10:34 +01:00 |
Enno Rehling
|
34e7373be4
|
fix the CI build (struct declared inside parameter list).
|
2015-01-12 18:31:04 +01:00 |
Enno Rehling
|
e8650b5b4a
|
test good and bad dreams, fix magicstreet test.
|
2015-01-12 18:22:59 +01:00 |
Steffen Mecke
|
27da082cc6
|
corrected good dreams message
|
2015-01-12 18:22:00 +01:00 |
Steffen Mecke
|
fdac137c0c
|
magic path warning was wrong way round
|
2015-01-12 18:21:41 +01:00 |
Enno Rehling
|
6159311e70
|
Merge pull request #104 from badgerman/tests-magicpath
Tests for magicpath (currently failing)
|
2015-01-12 18:02:51 +01:00 |
Enno Rehling
|
0bd1a8d6f4
|
add a utility function to test for message types.
|
2015-01-12 17:50:10 +01:00 |
CTD
|
d403afc7fc
|
Einfacher Test
Plus Bugfix für Gebäude ohne Improvement, damit diese auch die gleiche
Funktionalität aus der XML nutzen können.
|
2015-01-12 16:57:05 +01:00 |
CTD
|
34fc1b3d34
|
Variablen leserlicher gemacht
|
2015-01-12 10:55:07 +01:00 |
Enno Rehling
|
798b3d6ad6
|
Implement tests for magicpath. They are failing (Bug 2066).
Also move spell and race initialization code from being server-only into game_init, where tests can use it.
|
2015-01-12 08:18:41 +01:00 |
Enno Rehling
|
e937749475
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
src/kernel/faction.c
|
2015-01-11 01:25:10 +01:00 |
Enno Rehling
|
95d0b2a413
|
add current version of processing scripts
fix a crash in checkpasswd
|
2015-01-11 01:23:47 +01:00 |
Enno Rehling
|
4b6d65fb16
|
separate the game into a static library shared by server and tests.
|
2015-01-10 17:27:18 +01:00 |