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

111 Commits

Author SHA1 Message Date
Enno Rehling f2bb51b3ab Merge branch 'master' into develop 
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
 2017-03-26 21:01:21 +02:00
Enno Rehling 406f8ca3e6 BUG 2315: always use plural for resources 2017-03-26 20:25:01 +02:00
Enno Rehling 733c754e0f rename some configuration options. 
add them to the valid keys for eressea.ini, too.
 2017-03-25 14:15:01 +01:00
Enno Rehling 67a566d728 remove CRTAG_LOCLE define and lookups 2017-03-16 08:13:36 +01:00
Enno Rehling e68510a07e use report locae, not default, for EFFECTS and GRENZE 2017-03-15 21:30:53 +01:00
Enno Rehling d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling a31de0da4f BUG 2306: TRANSLATIONS Plural/Singular mixup. 
https://bugs.eressea.de/view.php?id=2306
 2017-03-11 17:22:40 +01:00
Enno Rehling 8b9f0f0894 BUG 2307: report mallorn trees as Mallorn in the CR. 
for legacy compatibility, we cannot call them Mallornbaeume.
 2017-03-10 23:18:09 +01:00
Enno Rehling 29a8342b4e BUG 2305: show the correct Parteitarnung in the CR. 
We didn't have the required tests, so of course I broke it.
 2017-03-07 19:30:52 +01:00
Enno Rehling ba8f51b7d4 Merge pull request #667 from ennorehling/hotfix/config-2301 
fix bugs 2301, 2302, 2303
 2017-03-06 21:57:23 +01:00
Enno Rehling 05bb109a09 BUG 2303: allied units are not traitors. 
had to rewrite the creport code for this, it is probably less efficient now than ever, but at least it works.
 2017-03-06 21:35:48 +01:00
Enno Rehling 4b246863c0 bug 2303: correct the test. 
we cannot reuse the memstream.
need to recreate it for each test.
need to rewrite the code in creport.c, it is crazy.
 2017-03-06 21:01:50 +01:00
Enno Rehling 5c1fb83c47 Merge branch 'hotfix/names' of https://github.com/ennorehling/eressea.git 2017-03-05 18:57:35 +01:00
Enno Rehling cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling dbe5980577 CR is missing saplings? 2017-03-05 18:47:49 +01:00
Enno Rehling 8d7f966391 BUG 2298: fix CR output. 
always use the plural form.
 2017-03-05 18:23:24 +01:00
Enno Rehling 0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +01:00
Enno Rehling 83f170541b short unit-test for resources in the CR. 
now complains because Bauern!=Bauer.
TODO: crtag is shit.
 2017-03-05 15:51:04 +01:00
Enno Rehling 6a87625409 refactor cr_output_resources for easy testing. 
Write a (failing) test that checks first resource is silver.
 2017-03-05 15:26:04 +01:00
Enno Rehling e0085eac0c write a test for get_addresses before modifying it. 2017-03-01 19:52:23 +01:00
Enno Rehling 295614643a more factionstealth testing. 2017-03-01 19:18:00 +01:00
Enno Rehling 4e5f1d05ce Be very strict about C standards. 
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
 2017-02-18 21:15:14 +01:00
Enno Rehling 456d1bd196 spellbooks should not use spellref, it's unnecessary. 2017-02-02 20:08:04 +01:00
Enno Rehling 7e69149c40 WIP: spellref everywhere 2017-02-02 16:52:32 +01:00
Enno Rehling ee88c13732 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-26 18:06:48 +01:00
Enno Rehling 39375e8d4a use the email address from eressea.ini in CR mailto 2017-01-26 18:06:15 +01:00
Enno Rehling d94cde67a4 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
Enno Rehling a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling 01233c4f82 UTF-8 statt utf-8. 
Auf besonderen Wunsch werden einheitlich Großbuchstaben verwendet.
 2016-12-05 07:54:43 +01:00
Enno Rehling e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling bc5e744347 i2b is a bullshit macro. 2016-11-17 21:23:49 +01:00
Enno Rehling 413f70d1a1 move market function out of config.c 2016-11-16 22:30:59 +01:00
Enno Rehling 11b122048b reduce dependency on save.h 
moving a_write* functions to attrib.h, which was most of the reason everyone and their mom include save.h
 2016-11-13 19:40:38 +01:00
Enno Rehling 29d072a186 remove the old ORCIFICATION code. 2016-11-13 17:13:59 +01:00
Enno Rehling 467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +01:00
Enno Rehling 03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling 754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling a3ad9a0222 I am now calling get_race far too often. Fix this a bit. 2016-09-20 20:27:41 +02:00
Enno Rehling 651ce11741 do not report seen_none in CR 2016-09-18 12:44:03 +02:00
Enno Rehling d8d3cd4cc4 move version string into a single object file 2016-09-15 20:11:38 +02:00
Enno Rehling acfb06392a Everything except report.c compiles. 
Not that I'm not claiming that it works.
 2016-09-13 17:02:51 +02:00
Enno Rehling f520d8396d make creport not use seen_region. 
remove jsreport from build
 2016-09-13 15:30:09 +02:00
Enno Rehling 71fa3600f7 recalculate [first,last) after lighthouses aand trvelthru 2016-09-13 09:09:35 +02:00
Enno Rehling a67950433d WIP: prepare_seen vs lastregion/firstregion. 
lighthouses and travelthru are handled by both, should only be in prepare_seen?
 2016-09-12 22:03:16 +02:00
Enno Rehling 7807f83830 fix compilation (buildno.h is gone) 2016-09-10 17:43:06 +02:00
Enno Rehling e200952e87 new version numbering in version.h 
eliminate buildno.h
TODO: update build scripts
 2016-09-10 17:41:44 +02:00
Enno Rehling 40d9ebfa94 reduce code duplication: itemcloak code was copied between NR and CR. 2016-08-29 19:37:47 +01:00
Enno Rehling fef2852c5e Reparatur Irrlichter 
https://bugs.eressea.de/view.php?id=2227
 2016-08-06 14:36:54 +02:00
Enno Rehling 8d4a2ed688 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-07-03 11:10:04 +02:00
Enno Rehling ca7b250c46 otherfaction can be null if not f->alive 2016-07-03 11:02:21 +02:00