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

1927 commits

Author SHA1 Message Date
Enno Rehling
7298968921 schema version 2 
faction no is a char(4), not an int.
 2019-04-24 08:08:50 +02:00
Enno Rehling
aab234a3f4 update to schema version 1 
- factions table is now faction
- no turn column
- new update logic
 2019-04-23 13:19:14 +02:00
Enno Rehling
91e40b7061 Bug 1982: Klone auflösen, und Magiern ihre permanete Aura und Trank zurück geben. 2019-04-07 21:37:06 +02:00
Enno Rehling
6351f04916 blnak line conflict? 2019-04-03 18:24:42 +02:00
Enno Rehling
3b1a615f25 Merge branch 'master' into develop 2019-03-31 21:20:21 +02:00
Enno Rehling
8868855837 allow setting password to null 2019-03-31 18:14:37 +02:00
Enno Rehling
53662878aa minor cleanup 2019-03-31 10:19:02 +02:00
Enno Rehling
fc6bb36ee4 BUG 2566 mountains with no low-level resources. 
NB: new data version
 2019-03-24 21:27:43 +01:00
Enno Rehling
7c01170563 Merge branch 'master' into develop 2019-03-24 17:27:58 +01:00
Enno Rehling
ea1bf3d3b9 Bug 2567: we had alliances with status 0 in the data. 2019-03-24 17:18:25 +01:00
Enno Rehling
d1fbd924e0 increase version number 2019-03-18 10:36:33 +01:00
Enno Rehling
8253d8f833 new players should have lastorders = 0, get password. 2019-03-03 13:11:20 +01:00
Enno Rehling
894bb4db4c BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-03-03 09:42:42 +01:00
Enno Rehling
de06600394 fix coverity errors 2019-03-03 09:42:42 +01:00
Enno Rehling
2e1bd01c54 asciification 2019-03-03 09:42:42 +01:00
Enno Rehling
1944c2c136 asciify more files 2019-03-03 09:42:42 +01:00
Enno Rehling
9e44b8a989 kaputte umlaute ersetzt, ascii 4 lyfe 2019-03-03 09:42:42 +01:00
Enno Rehling
9436640d22 remove UTF-8 BOM from sources 2019-03-03 09:42:42 +01:00
Enno Rehling
35bbcac97b eliminate warnings from cppcheck 2019-03-03 09:42:41 +01:00
Enno Rehling
3b81b7797f eliminate MAX/MIN macros completely 2019-03-03 09:42:41 +01:00
Enno Rehling
24eacbb40d eliminate MIN and MAX macros 2019-03-03 09:41:53 +01:00
Enno Rehling
6f771ace3e re-undo splint warning fizes 2019-03-03 09:41:53 +01:00
Enno Rehling
6f61ca87a7 fix some weak splint warnings 2019-03-03 09:41:53 +01:00
Enno Rehling
acbbf42db1 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-03-03 09:41:53 +01:00
Enno Rehling
e9b2918209 fix source encodings, break umlauts, ASCII everywhere 2019-03-03 09:41:15 +01:00
Enno Rehling
0de71b424a fix compilation 2019-03-03 09:41:15 +01:00
Enno Rehling
2a96fffeb5 starting to see diminishing returns. 2019-03-03 09:41:15 +01:00
Enno Rehling
484945d42a more allocation checks. 2019-03-03 09:41:15 +01:00
Enno Rehling
033070663a code analysis scan. 
add checks for malloc results.
reduce stack size.
 2019-03-03 09:41:15 +01:00
Enno Rehling
a16c829218 include what you use 2019-03-03 09:41:15 +01:00
Enno Rehling
ca7f3fbf88 reduce variables scope (cppcheck warnings). 2019-03-03 09:41:15 +01:00
Enno Rehling
07d2278741 re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2019-03-03 09:41:15 +01:00
Enno Rehling
d0577a5d6a cppcheck style warnings: reduce variable scope 2019-03-03 09:40:22 +01:00
Enno Rehling
45c44a03fb some static analysis warnings (cppcheck and msvc). 2019-03-03 09:39:52 +01:00
Enno Rehling
933914a301 re-enable disabled test. 2019-03-03 09:39:52 +01:00
Enno Rehling
11316a4992 remove jsreport. 
fix some cppcheck warnings.
 2019-03-03 09:39:52 +01:00
Enno Rehling
d162c2dee1 excise bsdstring from the project 2019-03-03 09:39:52 +01:00
Enno Rehling
32519e1683 version number increment 2019-03-03 09:39:52 +01:00
Enno Rehling
56251ffdaf reduce big arrays on the stack, report allies with new pump_paragraph function (WIP) 2019-03-03 09:39:27 +01:00
Enno Rehling
d642ff0fe7 new players should have lastorders = 0, get password. 2019-03-03 09:32:24 +01:00
Enno Rehling
d56eee9687 BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-02-16 20:14:34 +01:00
Enno Rehling
f744cebe66 fix coverity errors 2019-02-15 10:07:55 +01:00
Enno Rehling
a84a89dc51 asciification 2019-02-09 13:39:28 +01:00
Enno Rehling
642d043e7c asciify more files 2019-02-09 11:49:09 +01:00
Enno Rehling
2ecc710122 kaputte umlaute ersetzt, ascii 4 lyfe 2019-02-07 14:48:51 +01:00
Enno Rehling
793a666969 remove UTF-8 BOM from sources 2019-02-06 22:29:09 +01:00
Enno Rehling
818b309ebf eliminate warnings from cppcheck 2019-02-02 21:20:23 +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
20e0e8400b eliminate MAX/MIN macros completely 2019-01-24 17:51:26 +01:00
Enno Rehling
9b113c050e eliminate MIN and MAX macros 2019-01-24 16:34:07 +01:00
Enno Rehling
a4873d7a12 re-undo splint warning fizes 2019-01-24 14:26:11 +01:00
Enno Rehling
2defef021f fix some weak splint warnings 2019-01-24 14:26:11 +01:00
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
a848a1b2ee fix source encodings, break umlauts, ASCII everywhere 2018-12-17 12:07:51 +01:00
Enno Rehling
4fee151f35 fix compilation 2018-12-16 09:48:39 +01:00
Enno Rehling
3fec7eb4e3 starting to see diminishing returns. 2018-12-15 20:13:44 +01:00
Enno Rehling
7b8bc8af0f more allocation checks. 2018-12-15 20:01:51 +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
933bf2c596 include what you use 2018-12-15 18:42:31 +01:00
Enno Rehling
264822a354 reduce variables scope (cppcheck warnings). 2018-12-11 19:57:27 +01:00
Enno Rehling
dd7ffb5987 comment copypasta 2018-12-11 19:37:34 +01:00
Enno Rehling
bb5fb78a46 comment copypasta 2018-12-11 19:36:07 +01:00
Enno Rehling
494e2054bf Merge branch 'master' into develop 2018-12-09 20:06:12 +01:00
Enno Rehling
f0a1fe6134 BUG 2536 fix broken familiar spellbooks 2018-12-09 20:05:44 +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
2ac6a6826d some static analysis warnings (cppcheck and msvc). 2018-12-04 21:11:40 +01:00
Enno Rehling
dd7b0e4db3 re-enable disabled test. 2018-12-02 05:10:39 +01:00
Enno Rehling
01b7538ffd remove jsreport. 
fix some cppcheck warnings.
 2018-12-02 05:04:58 +01:00
Enno Rehling
06ccc7df42 excise bsdstring from the project 2018-12-01 20:25:06 +01:00
Enno Rehling
c0c06f0613 version number increment 2018-11-27 22:20:30 +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
3e54d307df replace bsdstring in bufunit 2018-11-24 12:26:52 +01:00
Enno Rehling
73540d733d Bug 2451: fix equip_unit for spells, 
update the familiar-fixing code from bug 2517.
 2018-11-22 22:13:23 +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
4403552b61 F*ck this MSVC message: 
warning C6001: Using uninitialized memory
It is confused, and I screwed up trying to work around it.
 2018-11-17 22:12:34 +01:00
Enno Rehling
aa466f3cc8 avoid code analysis warnings 2018-11-17 22:01:23 +01:00
Enno Rehling
d2389fa87b Bug 2517: Vertraute ohne eigene Zauber reparieren 
Trennung von caster und mage in spells.c
 2018-11-17 21:31:05 +01:00
Enno Rehling
83b6db41fe remove legacy msg_level struct (unused). 2018-11-13 17:24:22 +01:00
Enno Rehling
c48371387c New Syntax: CONTACT [UNIT|FACTION] ... 
Move everything to contact module, add tests.
 2018-11-04 18:07:42 +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
dac6ef660d Merge branch 'master' into develop 2018-11-04 09:10:54 +01:00
Enno Rehling
1a10c0271d Bug 2511: LERNE AUTO fixed, student limit increased 2018-11-04 09:08:50 +01:00
Enno Rehling
89b10ee63d bug 2463 fix xmastrees, fix get_key/set_key 2018-11-03 20:30:57 +01:00
Enno Rehling
8bcdb5c381 Bug 2509 contd: new_region still creating duplicates 2018-11-03 15:48:35 +01:00
Enno Rehling
6c11e740ff bug 2510 duplicate region after datafile read 2018-11-03 14:28:32 +01:00
Enno Rehling
a2fe396b68 do not delayed-resolve regions 2018-11-01 21:20:11 +01:00
Enno Rehling
25b5f797e9 add building_create, too 2018-11-01 21:18:24 +01:00
Enno Rehling
fc4f32f8e0 read_building_reference does not need a callback 2018-11-01 21:13:05 +01:00
Enno Rehling
ba9af6d765 1. region_create(uid) 
2. read_region_reference never gets a callback, so save it.
 2018-11-01 21:08:59 +01:00
Enno Rehling
85fe80d858 unit_create function instead of wild calloc calls. 2018-11-01 10:16:49 +01:00
Enno Rehling
d9167b8a59 do not use late resolution for factions, ever 2018-11-01 09:53:23 +01:00
Enno Rehling
b0485ec57f eliminate struct ally, use struct allies 2018-10-31 17:54:40 +01:00
Enno Rehling
b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling
54307d3b50 can read and write struct allies. 2018-10-30 18:45:13 +01:00
Enno Rehling
a26438c175 Merge branch 'develop' into allies 2018-10-30 18:40:15 +01:00
Enno Rehling
253849416a create referenced factions early instead of read_faction_reference. 2018-10-30 06:30:32 +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
00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling
da9d3d3573 Merge branch 'master' into develop 2018-10-29 20:10:51 +01:00
Enno Rehling
c54ab6a3df fix CID 189401 and 189402 2018-10-29 20:06:18 +01:00
Enno Rehling
e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +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
7537f8c8ed unused function 2018-10-26 22:18:06 +02:00
Enno Rehling
2e076aab1e ally_add is now module-private 2018-10-26 22:16:34 +02:00
Enno Rehling
1e8c7224a4 make consistent use of get_group. 2018-10-26 22:12:43 +02: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
557c624200 contant name conflict resolved 2018-10-26 16:08:55 +02:00
Enno Rehling
0ac3dc5ead WIP: refactor allies api 2018-10-26 10:54:09 +02:00
Enno Rehling
be0c0161da use swap database for unit descriptions. 2018-10-24 20:21:21 +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
da3270517a fix type conversion and incomplete database test. 2018-10-24 19:39:30 +02:00
Enno Rehling
32009b7043 store passwords in swapdb 2018-10-24 09:27:48 +02:00
Enno Rehling
83959c375f kill orderdb.[hc] files 2018-10-24 09:02:19 +02:00
Enno Rehling
6738962d73 missing files 2018-10-24 07:00:26 +02:00
Enno Rehling
b8ee5b3c76 begin the work to swap strings to database 2018-10-23 22:31:42 +02:00
Enno Rehling
35ed981cd5 help the VS heap profiler understand the code. 
reorder calloc arguments.
rename ursprung -> origin.
 2018-10-22 21:51:11 +02:00
Enno Rehling
e5a59af19a Merge branch 'master' into develop 2018-10-21 20:13:19 +02:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +02:00
Enno Rehling
b8c49914e9 missing include 2018-10-20 20:28:16 +02:00
Enno Rehling
57be0f2e6a Ich habe mich geirrt, was das Verhalten von atoi in Windows angeht. Alles zurueck. 2018-10-20 20:10:11 +02:00
Enno Rehling
01edb1e204 move that errno-preserving atoi to strings.c 2018-10-20 19:56:38 +02:00
Enno Rehling
c2570b1e58 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-10-20 10:09:37 +02:00
Enno Rehling
c7c306b0e5 implement atoi so it doesn't change errno (for now) 2018-10-20 09:58:50 +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
a7b9f6dc3e Do not use 0 to mean NULL pointers. 2018-10-14 11:49:48 +02:00
Enno Rehling
4f8dd4cb0f checker is going to use locales, fix them up, too. 2018-10-06 20:47:23 +02:00
Enno Rehling
fb8507e0d2 support for non-utf8 encodings has rotted, kill it. 2018-09-30 15:02:03 +02:00
Enno Rehling
0c6ec47598 fix compilation 2018-09-30 13:45:19 +02:00
Enno Rehling
b03da543b6 make findparam_ex part of laws, where building names are known. 2018-09-29 20:06:58 +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
b22d838a57 move gamedata.c to kernel 2018-09-29 13:21:46 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
b18f8ca9fb change database selection, fix in-memory db 2018-09-29 09:56:05 +02:00
Enno Rehling
b47a41541f write a new (expensive) in-memory db driver for orders. 2018-09-28 21:43:20 +02:00
Enno Rehling
91c49659ef orderdb is glue code, belongs outside of kernel. 2018-09-28 21:02:32 +02:00
Enno Rehling
7b9e72e559 reduce dependeny spaghetti for database code. 2018-09-28 20:51:16 +02:00
Enno Rehling
04b8068979 rename password functions to match PHP. 2018-09-26 21:07:39 +02:00