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

226 commits

Author SHA1 Message Date
Enno Rehling
2014a23212
Merge pull request #740 from stm2/add_2383 
remove irace assumptions
 2017-11-18 18:25:50 +01:00
Steffen Mecke
6e53f15a1c addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:10:49 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
c2634bd095 move readorders to orderfile module. 2017-10-07 19:44:23 +02:00
Enno Rehling
ecce8e5d91 Revert "refactor: extract a read_order function." 
This reverts commit 8b39133dbf.
 2017-10-07 18:06:54 +02:00
Enno Rehling
0537d39b17 add a fix for 2367 to fix_familiars 2017-10-07 03:22:35 +02:00
Enno Rehling
f594a908df deprecate old get_mage implementation. 
fix test_familiar_equip with new get_mage.
 2017-10-06 21:53:07 +02:00
Enno Rehling
86e99a560c read_order must use parse_order (not create) to properly handle make temp. 2017-09-26 18:52:26 +02:00
Enno Rehling
8b39133dbf refactor: extract a read_order function. 2017-09-26 17:07:49 +02:00
Enno Rehling
3aed0b1ee5 fix gcc compilation 2017-09-22 16:39:46 +02:00
Enno Rehling
0c16727d41 hashing implemented with linear probing and tombstones. 
WIP: this crashes 572 in faction_getmages?
 2017-09-22 09:15:37 +02:00
Enno Rehling
902e2126c9 WIP: change the resolve.h API 2017-09-21 17:29:01 +02:00
Enno Rehling
89e162c12a change resolve.h api to use int, not variant. 2017-09-19 11:42:02 +02:00
Enno Rehling
0d0fb49381 attempt to fix valgrind bug 2017-09-16 09:34:47 +02:00
Enno Rehling
0a3eb9ac7b fix read/write of regioninfo. 2017-09-16 09:03:42 +02:00
Enno Rehling
1b19e8d19c BUG 2365: Ozeane sollen keine Beschreibung haben können. 
https://trello.com/c/GSeHT8t6/618-why-r-display-not-r-land-display
 2017-09-16 08:42:49 +02:00
Enno Rehling
423fe65377 move region display to land_region struct, oceans do not have descriptions. 2017-09-16 07:58:57 +02:00
Enno Rehling
8c6362002e fix some niggles, delete invalid test. 2017-09-16 07:37:33 +02:00
Enno Rehling
860afe855f improve the skill read/write code. 2017-09-15 22:03:54 +02:00
Enno Rehling
8b4e3b7738 extract write_skills and read_skills functions. 2017-09-15 21:55:57 +02:00
Enno Rehling
a8bfa5e095 try fixing familars without a mage. 2017-08-31 21:19:25 +02:00
Enno Rehling
3ceeb54006 Merge branch 'master' into develop 2017-06-18 22:05:20 +02:00
Enno Rehling
8178f3f1e6 BUG 2334: Nochmal Ponnuki 
Monsters cannot attack or guard when they are fleeing
 2017-06-18 14:20:01 +02:00
Enno Rehling
69ef2c7ce7 Merge branch 'master' into develop 
Conflicts:
	src/magic.c
 2017-06-18 01:11:40 +02:00
Enno Rehling
f6ba5b6a53 BUG 2333 NMR-Anzahl im WB falsch 
https://bugs.eressea.de/view.php?id=2333
 2017-06-11 17:06:13 +02:00
Enno Rehling
5b807e2057 crash casued by spell conversion. 
remove unit from faction, not only region!
also remove spammy warning that has no value.
 2017-06-04 14:13:05 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
30cfe2c0c0 convert RC_SPELL to at_observer during readgame. 2017-05-24 08:18:55 +02:00
Enno Rehling
c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
0c8a9354db rmt_find no longer used. 
handle old data files with rm_iron, etc.
 2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling
8cfcffc4aa remove data_turn and gamename from global settings. 
make run-turn.sh work without valgrind
 2017-03-13 09:19:37 +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
acfb666539 remove rtype->uget funpointer, and lua callbacks. 
fix a missing lua_pop that trashed the heap.
 2017-03-04 20:59:43 +01:00
Enno Rehling
794dae11cf remove artsculpture and genericbuilding. 
deal with buildings having an unknown type.
 2017-02-24 14:29:14 +01:00
Enno Rehling
f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling
ba1fdcce59 remove race.describe funpointer 2017-02-20 07:47:36 +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
f6fcd39293 add a failing test for familiars (disabled). 
remove superfluous init_locales calls.
 2017-02-11 22:28:57 +01:00
Enno Rehling
ae83448e4a Deveron is now just E3 with a different name. 
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
 2017-02-02 10:10:21 +01:00
Enno Rehling
af1ce9b84e issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-26 18:06:48 +01:00
Enno Rehling
1bd6ab11ea FACTION and PARTEI should both start orders. 2017-01-26 18:06:48 +01:00
Enno Rehling
6e51570229 remove ERESSEA keyword from "bad password" message. 2017-01-26 18:06:16 +01:00
Enno Rehling
d1b5daf833 compiles with gcc on rpi 2017-01-26 18:05:26 +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
78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling
303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling
03a94d1264 remove unused and broken backup functionality 2016-11-14 01:35:45 +01:00