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

437 commits

Author SHA1 Message Date
Enno Rehling
6637c94852 do not allow transfer of heros and limited units. 2019-05-01 20:46:26 +02:00
Enno Rehling
bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] 2019-04-30 18:40:24 +02:00
Enno Rehling
75dfed8082 Leerzeichen aus Beschreibungen trimmen. 2019-04-24 13:09:59 +02:00
Enno Rehling
5dd12df100 BUG 2564: show new spells. 2019-03-03 13:11:03 +01:00
Enno Rehling
642d043e7c asciify more files 2019-02-09 11:49:09 +01:00
Enno Rehling
88dd9203dd Merge remote-tracking branch 'upstream/develop' into develop 2019-02-02 21:18:59 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling
172387e6bc BUG 2549 promote after recruit 
calculating max units before PROMOTE requires that all recruitment has finished.
 2019-01-20 16:51:04 +01:00
Enno Rehling
7ea64be314 code analysis scan. 
add checks for malloc results.
reduce stack size.
 2018-12-15 19:38:40 +01:00
Enno Rehling
1ca1c7cfea re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2018-12-09 14:41:14 +01:00
Enno Rehling
e47da17cc6 Merge branch 'master' into develop 2018-12-09 03:48:29 +01:00
Enno Rehling
089be4bca8 cppcheck style warnings: reduce variable scope 2018-12-09 03:42:57 +01:00
Enno Rehling
e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling
0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +01:00
Enno Rehling
c856228d5e variable scope reduction 2018-12-02 15:52:16 +01:00
Enno Rehling
e155f1ef29 Fix MSVC static analysis warnings in laws.c 2018-11-23 22:16:44 +01:00
Enno Rehling
bb11026321 more sbstring conversions in reporting functions. 2018-11-23 22:00:37 +01:00
Enno Rehling
4a66b558c5 WIP: refactor struct sc_mage (make it private). 
tests are failing and/or slow.
 2018-11-18 21:47:14 +01:00
Enno Rehling
0fd7906d41 extract contact logic to a module 
add missing tests for contact to units.
add an attribute for contacting a faction.
 2018-11-04 15:53:27 +01:00
Enno Rehling
d9f800f444 Bug 2482: Untote können ihre eigenen Gegenstände reservieren. 2018-11-03 18:25:22 +01:00
Enno Rehling
b0485ec57f eliminate struct ally, use struct allies 2018-10-31 17:54:40 +01:00
Enno Rehling
1e8c7224a4 make consistent use of get_group. 2018-10-26 22:12:43 +02:00
Enno Rehling
56ccb18fb1 oh my god, please no. 2018-10-26 20:57:59 +02:00
Enno Rehling
ac3a4d91c9 simplicate the use of ally.c 2018-10-26 19:47:50 +02:00
Enno Rehling
0ac3dc5ead WIP: refactor allies api 2018-10-26 10:54:09 +02:00
Enno Rehling
53e123b36a do not use unit.display directly, use getter/setter instead. 2018-10-24 20:16:17 +02:00
Enno Rehling
516a53c0c7 swap faction.banner to database 2018-10-24 19:54:07 +02:00
Enno Rehling
5aa3b1161f prefer unit_addorder over addlist where possible. 2018-10-14 16:26:36 +02:00
Enno Rehling
d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling
bc5f2ea6d1 move keyword.[hc] to util 2018-09-29 18:13:32 +02:00
Enno Rehling
991fe8fd8d enable checker build. 
remove getid aliases from parser.h
 2018-09-29 13:35:49 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
04b8068979 rename password functions to match PHP. 2018-09-26 21:07:39 +02:00
Enno Rehling
ccc5556682 adding code to export faction information. 
sqlite3 implementation only, not tied to anything yet.
add faction.uid
remove faction.subscription
 2018-09-24 20:18:21 +02:00
Enno Rehling
174a91968b make herb growth code a little more readable. 2018-09-22 08:54:17 +02:00
Enno Rehling
2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling
062abe8102 refactor siege property w. getter/setter 2018-09-09 17:10:18 +02:00
Enno Rehling
36b7104ce3 extract long_order_allowed for use in autostudy. 2018-08-05 06:43:11 +02:00
Enno Rehling
ee8a02c425 autostudy framework 2018-08-05 06:41:03 +02:00
Enno Rehling
116ff7247d Remove unused "message" events (old NPC sh*t). 2018-08-02 16:41:23 +02:00
Enno Rehling
ad0464ab50 BUG 2168: call sink_ship for ships that take too much damage. 2018-08-01 10:04:12 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
cd2624de8a stop reallocation spell parameters. 
fix involuntary tree growth in test, message check.
 2018-05-06 15:49:34 +02:00
Enno Rehling
0e3170a0cb merge 2018-05-05 07:39:25 +02:00
Enno Rehling
d568e79490 spellbooks contain spellref, not spell *. 
for order-independent load from XML.
 2018-05-05 07:38:11 +02:00
Enno Rehling
08663b6eb5 fix last commit. refactoring with the MSVC IDE is prone to errors. 2018-04-28 15:57:51 +02:00
Enno Rehling
fc4b7ba73d refactor: extract cycle_route and test it (with PAUSE). 2018-04-22 11:02:05 +01:00
Enno Rehling
9ba255e269 allow a maxnmr setting in eressea.ini to override the nmr.timeout rule. 2018-03-11 19:07:05 +01:00
Enno Rehling
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling
4181e23d15 FAST_CONNECT is always on. 
fix more cppcheck messages.
 2018-02-25 18:30:20 +01:00
Enno Rehling
7d789d9896 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-14 20:03:11 +01:00
Enno Rehling
d15684a546 fix test_process_turn failure. 
move turn global to calendar.
promote calendar module to kernel.
 2018-02-14 20:01:36 +01:00
Enno Rehling
f4be3a1374 remove duplication setstatus -> unit_setstatus 2018-02-14 11:24:38 +01:00
Enno Rehling
398a258658 cppcheck: variable scopes, etc. 2018-02-11 15:57:31 +01:00
Enno Rehling
cfc3171021 constrict the seenspell module a bit more, move functionality inside. 2018-02-08 19:37:47 +01:00
Enno Rehling
ec48017520 move spell reporting attributes to a separate module. 2018-02-08 18:33:58 +01:00
Enno Rehling
df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling
e233d08e8f move more reporting code to reports.c 2018-01-26 17:39:15 +01:00
Enno Rehling
4247ef96b1 why are we using the short type? 2018-01-21 11:14:55 +01:00
Enno Rehling
7db82ba21e refactoring for readability 2018-01-21 11:03:51 +01:00
Enno Rehling
88a96d5723 begin adding tests for skills. 2018-01-21 11:03:49 +01:00
Enno Rehling
71c9b5adef Fix broken SHOW logic for potions. 2018-01-14 17:40:49 +01:00
Enno Rehling
7a64053dc9 better testing for is_potion (should be a function) 2018-01-14 17:40:49 +01:00
Enno Rehling
2b2a79620c compiles, test fails, xmlreader includes need fixing 2018-01-14 17:40:48 +01:00
Enno Rehling
3d69f4e372 start removing dependencies on potion_type. 
use item_type where we can. does not compile, is WIP.
 2018-01-14 17:40:48 +01:00
Enno Rehling
e4859e68c9 do not use MIN and MAX. 2018-01-01 08:23:52 +01:00
Enno Rehling
a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +01:00
Enno Rehling
50173d5be3 PATH_MAX and MAX_PATH are crazy. 2017-12-29 11:44:14 +01:00
Enno Rehling
f98eab56c4 platform.h is only for WIN32 now. 
replace MIN and MAX macros, they are BAD.
 2017-12-29 06:13:28 +01:00
Enno Rehling
5b1d27542a reduce dependence on platform.h. 
gradually stop using MAX and MIN (mistakes were made).
 2017-12-28 18:29:40 +01:00
Enno Rehling
cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +01:00
Enno Rehling
e2f954b7f6 BUG 2392: anyone can use weapons, as long as they have _some_ skill. 2017-12-17 10:16:56 +01:00
Enno Rehling
93613b99af slprintf is not in BSD (it's theft from samba). 2017-12-11 19:23:56 +01:00
Enno Rehling
17ee0e50b6 cppcheck warnings and scope reductions. 2017-12-08 21:08:11 +01:00
Enno Rehling
05425b5101 pull economy requests into header, rename the struct. 2017-12-04 19:20:48 +01:00
Enno Rehling
290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Enno Rehling
54b016a735 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-15 20:37:46 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
3b6d7a4055 Merge branch 'develop' 2017-11-12 22:15:47 +01:00
Enno Rehling
2703b01ade units can rename the ship they are on if their faction owns it. 
this fixes bug 2384.
 2017-11-12 15:01:58 +01:00
Enno Rehling
34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling
eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling
7196f799e6 add a terrain_changed function for use with static terrain variables. 2017-11-06 20:29:26 +01:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
ca6cbe5906 fixing commit 1b53128e1a and adding a test for cansee. 2017-10-13 19:07:57 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +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
02cfde0a49 fix create_unit default order memory leak 2017-10-01 17:08:05 +02:00
Enno Rehling
0f10b58167 add tests and rewrite MAKE TEMP 2017-10-01 15:08:26 +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
2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling
fc4bde47f6 kill the old curses enum and oldcursename. 2017-08-21 20:48:00 +02:00
Enno Rehling
7985ebe511 replace ct_find calls with constants. 
reorder a lot of includes.
 2017-08-21 20:18:19 +02:00
Enno Rehling
54b5b09e15 Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
	src/modules/autoseed.c
 2017-08-18 20:31:14 +02:00