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

279 commits

Author SHA1 Message Date
Enno Rehling
f96e88e3e0 write a warning in the template about password replacement. 
for new factions, put the generated password into the template.
normalize and secure password generation.
 2019-01-12 21:26:48 +01:00
Enno Rehling
2477349092 missing newline 2019-01-12 08:05:05 +01:00
Enno Rehling
264822a354 reduce variables scope (cppcheck warnings). 2018-12-11 19:57:27 +01:00
Enno Rehling
025cf18ab2 start adding legacy tests for paragraph 2018-12-01 21:56:21 +01:00
Enno Rehling
924ce441dd fix overly long lines in NR. 2018-12-01 21:51:52 +01:00
Enno Rehling
06ccc7df42 excise bsdstring from the project 2018-12-01 20:25:06 +01:00
Enno Rehling
f9ee13b435 convert report_template to sbstring 2018-11-30 10:52:32 +01:00
Enno Rehling
2de63536f7 more sbstring conversions 2018-11-30 10:26:49 +01:00
Enno Rehling
3c703653aa oops. broke test again with another case of too many periods. 2018-11-29 06:46:08 +01:00
Enno Rehling
88792e1d09 fix display of luxury prices, period at end of description. 2018-11-28 20:57:17 +01:00
Enno Rehling
d3713be6bd more sbstring use in reports. 
fix paragraph lines with very long words, indirectly test through region report.
 2018-11-28 20:18:22 +01:00
Enno Rehling
2fe5c0e0f7 split region reporting into more and smaller functions. 2018-11-28 18:30:50 +01:00
Enno Rehling
56f54a62e8 print spells with sbstring 2018-11-28 12:45:48 +01:00
Enno Rehling
6f45c0df86 unsigned/signed comparison 2018-11-27 21:31:17 +01:00
Enno Rehling
308c9f642f define SIZE_MAX if needed. 2018-11-27 21:06:30 +01:00
Enno Rehling
cd0ba434b0 replace sbs_cut with more powerful sbs_substr 2018-11-27 20:50:58 +01:00
Enno Rehling
be3f63416d some factions have very long names, breaking my buffer. 
use sbstring with care.
fix hackish utf8 space detection.
 2018-11-27 04:17:16 +01:00
Enno Rehling
304bebf291 reduce big arrays on the stack, report allies with new pump_paragraph function (WIP) 2018-11-26 22:01:18 +01:00
Enno Rehling
8c02d14f13 undo the period-at-end fix for region info, a test breaks 2018-11-25 09:38:58 +01:00
Enno Rehling
8855574938 report.c is the last user of bsdstring 2018-11-24 21:47:27 +01:00
Enno Rehling
c757f83a71 eliminate bsdstring from reports.c 
add missing period at end of region info.
 2018-11-24 21:25:46 +01:00
Enno Rehling
3e54d307df replace bsdstring in bufunit 2018-11-24 12:26:52 +01:00
Enno Rehling
b0485ec57f eliminate struct ally, use struct allies 2018-10-31 17:54:40 +01:00
Enno Rehling
a26438c175 Merge branch 'develop' into allies 2018-10-30 18:40:15 +01:00
Enno Rehling
ed6a6b4cf2 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-30 06:28:09 +01:00
Enno Rehling
89d752bc1f BUG 2508: wipe edges with 0 2018-10-29 16:19:29 +01:00
Enno Rehling
558390a4a6 separate ally_ api from allies_ api, 
delete unallied factions,
start worrying about serialization.
 2018-10-28 13:45:36 +01:00
Enno Rehling
d7a8a9b406 fix that catastrophic merge, make struct ally module-private 2018-10-26 21:49:58 +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
d1b4a47e1f Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-26 16:08:26 +02:00
Enno Rehling
b3361e3ccb Merge branch 'develop' into allies 2018-10-26 14:13:28 +02:00
Enno Rehling
c3d9e9dbaf report allies without bsdstring 2018-10-26 14:13:00 +02:00
Enno Rehling
6007628096 report.c is next 2018-10-26 14:00:48 +02:00
Enno Rehling
516a53c0c7 swap faction.banner to database 2018-10-24 19:54:07 +02:00
Enno Rehling
eddcefed77 reduce number of allocations in report_region (edges). 
remove the swap database file for orders (when not using memory).
 2018-10-19 20:49:58 +02:00
Enno Rehling
d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37: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
d9ba7be884 Merge branch 'master' into develop 2018-07-31 10:42:53 +02:00
Enno Rehling
e9bded4a87 BUG 2469 wrong default quantity for construction reqs 2018-07-31 10:13:00 +02:00
Enno Rehling
38cb6297bb Merge branch 'master' 2018-06-24 20:36:32 +02:00
Enno Rehling
a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling
5b0f3f9ea7 more sbstring upgrades 2018-06-09 21:22:02 +02:00
Enno Rehling
4b5bd11f29 spell_syntax without bsdstring, better tests. 2018-06-03 13:29:54 +02:00
Enno Rehling
226fa2ba08 fix crash in region messages. 2018-05-20 17:11:29 +02:00
Enno Rehling
4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling
19b3b5b35a change how message types are created (more prep work for expat) 2018-05-18 19:58:49 +02:00
Enno Rehling
6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling
ef74b8e759 reduce the footprint of nrmessage 2018-05-18 02:46:34 +02:00
Enno Rehling
615dfe7ec5 Get the NR message text from locale. 2018-05-17 22:47:16 +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
75aff73e9a Merge branch 'develop' 2018-05-03 23:01:42 +02:00
Enno Rehling
5bcd8369af ignore sqlite setting errno 2018-05-03 22:40:54 +02:00
Enno Rehling
3db9d5d878 merge from develop. luxuty price conflict resolved. 2018-05-01 17:23:46 +02:00
Enno Rehling
b44e4e747d ships and items never have multi-stage builds. 
we are going to make sure of this soon.
 2018-04-30 23:23:48 +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
da984b5880 BUG 2425: lighthouses can see units. 2018-03-11 14:40:38 +01:00
Enno Rehling
346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling
bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling
6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling
622c103b00 more cppcheck messages 2018-02-26 19:48:52 +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
cf46acdc6a bufunit does not write an indent, doe not need the parameter. 2018-02-24 19:46:34 +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
b5ea102372 cppcheck: scope reductions and a false positive. 2018-02-11 16:14:00 +01:00
Enno Rehling
ec48017520 move spell reporting attributes to a separate module. 2018-02-08 18:33:58 +01:00
Enno Rehling
ba14fab3a3 macros should have uppercase names. 2018-02-03 14:49:35 +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
01dd489b7a BUG 2403: endless loop (variable rename gone wrong). 2017-12-31 16:36:59 +01:00
Enno Rehling
a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +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
5dabd19504 add tests for visible_unit, remove unused cansee_ex 2017-12-23 17:49:30 +01:00
Enno Rehling
6bd4e543ba BUG 2395: lighthouses were seeing units they should not. 
DRY!
 2017-12-23 17:37:24 +01:00
Enno Rehling
cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +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
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling
f00ff2d16e BUG 2368: additional space 2017-10-06 04:14:07 +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
f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +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
c99e92db20 kill curse cache logic, it was a bad idea. 
ct_find is almost never what we want to do.
 2017-08-21 19:43:35 +02:00
Enno Rehling
abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling
7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02: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
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
f699c32f0e BUG 2298: fix NR display. 
always use correct singular or plural form.
 2017-03-05 18:25:15 +01:00