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

1512 commits

Author SHA1 Message Date
Steffen Mecke
2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling
73c1478b87 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-18 18:26:37 +01:00
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
Enno Rehling
50e242b810 fix include of renamed header 2017-11-18 13:02:12 +01:00
Enno Rehling
2224b59ff9 organize database drivers in their own directory 2017-11-18 12:55:07 +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
d2356d9e4f fix name of config variables. 2017-11-12 14:32:08 +01:00
Enno Rehling
48a58fc907 sqlite optimizations: transactions, journal_mode, synchronous. 2017-11-11 21:46:16 +01:00
Enno Rehling
79b397e07f fix config_get, has no default. 2017-11-10 16:32:20 +01:00
Enno Rehling
6923fe5c53 fix lua dbupdate 
write sqlite data to a temporary db by default (configurable).
 2017-11-10 16:29:48 +01:00
Enno Rehling
f8e552ab6e gcc and clang want function pointers to be cast. 2017-11-10 08:02:52 +01:00
Enno Rehling
05b7837070 fix parser to keep a reference to the order it is parsing. 
make push/popstate not crash. pass unit tests.
 2017-11-10 07:56:56 +01:00
Enno Rehling
df4cc70abf add nul terminator to loaded string. 2017-11-10 07:45:41 +01:00
Enno Rehling
89bf17cdca almost have sqlite storage working (in memory, not file). 
but test_teach_magic crashes.
 2017-11-09 21:33:42 +01:00
Enno Rehling
0cd9651690 fix sqlite linking for tests. 
implement save_order for sqlite.
 2017-11-09 21:12:25 +01:00
Enno Rehling
9f778c0ae9 fix symetric db_open and db_close calls. 2017-11-09 20:17:06 +01:00
Enno Rehling
fee9b6d0a8 separate database logic from order_data. 
laying groundwork for different database backends.
 2017-11-09 19:55:28 +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
31d15550ed Add test coverage for NAME ALLIANCE. 2017-11-06 20:38:28 +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
373d738084 add a modules.icebergs configuration variable. 2017-11-05 19:35:06 +01:00
Enno Rehling
440679da87 code that uses newterrain needs to set up terrains in tests. 2017-11-05 17:00:40 +01:00
Enno Rehling
2b81334ba2 use the correct swamp terrain, still failing. newterrain is a plague. 2017-11-05 16:43:01 +01:00
Enno Rehling
a17c8ada71 Add a test for the happy case of the BUY command. 2017-11-04 20:10:05 +01:00
Enno Rehling
5af5daa355 BUG 2378: Fix magic armor resistance calculation. 
Use frac_one constant where applicable.
 2017-10-29 18:55:43 +01:00
Enno Rehling
551f349309 begin work on 3.15 release 2017-10-28 19:46:17 +02: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
4257a9891c another test. moving some deckchairs around. 2017-10-14 09:01:14 +02:00
Enno Rehling
5a40ff9e62 merge conflict fix 2017-10-13 19:35:12 +02:00
Enno Rehling
78360b1466 refactoring: move order_data to orderdb module. 2017-10-13 19:34:39 +02:00
Enno Rehling
8a5164806b try fixing coverity complaints 2017-10-13 19:33:29 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
394839f7a4 WIP: optimized study orders, failing 15 study tests 2017-10-13 19:33:28 +02:00
Enno Rehling
1033143411 fix gcc build 2017-10-13 19:33:28 +02:00
Enno Rehling
42f7be4bb9 do not use a list to store several million entries. 2017-10-13 19:33:28 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
2b54605080 remove order de-duplication for short and study orders. 2017-10-13 19:33:27 +02:00
Enno Rehling
db0bd8d4db refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-13 19:33:27 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02: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
2ce94f2d47 BUG 2367: refactor create_newfamiliar. 
add first failing test for bug report.
 2017-10-06 21:23:58 +02:00
Enno Rehling
4452f93009 BUG 2367: add a test for set_familiar. 2017-10-05 22:13:39 +02:00
Enno Rehling
02cfde0a49 fix create_unit default order memory leak 2017-10-01 17:08:05 +02:00
Enno Rehling
03f46e35c4 one short order to rule them all. 2017-09-30 20:09:30 +02:00
Enno Rehling
e50c421b3f can remove the keyword from order_data now 2017-09-30 20:08:22 +02:00
Enno Rehling
a067838fa0 test all the edge cases. 2017-09-30 19:44:39 +02:00
Enno Rehling
5c63d20ff7 fix remaining bugs 2017-09-30 19:35:40 +02:00
Enno Rehling
54fdda85cd smallify order 2017-09-30 19:22:24 +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
e0514eddb5 let callers pass memory into create_order_i 2017-09-25 22:15:13 +02:00
Enno Rehling
9a1295b4a5 push whitespace eating down the stack a bit. 2017-09-25 22:12:49 +02:00
Enno Rehling
778f487afa remove whitespace eating from parse_order. 2017-09-25 22:08:23 +02:00
Enno Rehling
6bf2ac34e3 test that whitespace is ignored when parsing orders 2017-09-25 22:04:16 +02:00
Enno Rehling
1203b6e23a fix clang build warning 2017-09-22 19:13:42 +02:00
Enno Rehling
f350b81d51 gcc warning 2017-09-22 17:59:23 +02:00
Enno Rehling
8ebd4c2066 some more bugs reading objects that are conditional on save-data 2017-09-22 17:58:10 +02:00
Enno Rehling
0a9705809b fix some bugs created during conversions (thanks, tests!) 2017-09-22 17:19:55 +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
afe4532966 remove code for unsupported old region references 2017-09-21 17:29:01 +02:00
Enno Rehling
902e2126c9 WIP: change the resolve.h API 2017-09-21 17:29:01 +02:00
Enno Rehling
cda17d5379 The minimum data version has actually been 332 for a long time. 2017-09-21 16:30:29 +02:00
Enno Rehling
89e162c12a change resolve.h api to use int, not variant. 2017-09-19 11:42:02 +02:00
Enno Rehling
30777e5948 CID 173898 'Constant' variable guards dead code 2017-09-18 20:27:34 +02:00
Enno Rehling
4bccc87f2b fix Invalid read (valgrind) in remove_skill 2017-09-18 20:20:13 +02:00
Enno Rehling
832ba5f948 relax the limit on shortness of names a bit. 2017-09-18 20:14:46 +02:00
Enno Rehling
f43ec9ee0f remove equipment.name, save an allocation. 2017-09-18 20:03:23 +02:00
Enno Rehling
b4fc7a1ab4 fix coverity nag about spellbooks. 2017-09-18 19:51:47 +02:00
Enno Rehling
2451a8f637 resource names are max 23 bytes long. 
fix rt_find nul-termination bug
 2017-09-18 17:57:59 +02:00
Enno Rehling
c45c211dcf merge equipment fixes from develop 2017-09-18 17:47:24 +02:00
Enno Rehling
e2f6ada862 limit equipment names to 15 byte plus nul. 2017-09-18 17:46:26 +02:00
Enno Rehling
4cab65d233 fail get_equipment test when name is exactly 16 bytes long. 2017-09-18 17:32:39 +02:00
Enno Rehling
5605510351 Merge branch 'develop' 2017-09-18 17:27:09 +02:00
Enno Rehling
6ab35d80d0 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-09-18 17:26:50 +02:00
Enno Rehling
7fdbb1b939 add a test for rt_find to flush out substring matches. 2017-09-18 17:26:34 +02:00
Enno Rehling
69079ce319 remove it_register, because it does nothing. 2017-09-18 17:20:58 +02:00
Enno Rehling
1f65932794 add a test for get_equipment with substrings. 2017-09-18 17:20:09 +02:00
Enno Rehling
c9445ab517 change resource_type trie storage 2017-09-18 11:48:42 +02:00
Enno Rehling
97dc98862b do not use strncpy, then 2017-09-18 08:39:06 +02:00
Enno Rehling
455e03fa05 try and make coverity understand the equipment trie. 
shorten names.
 2017-09-17 20:42:43 +02:00
Enno Rehling
8e0bdbe428 coverity scan does not understand get_or_create_equipment? 2017-09-17 09:31:43 +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
a569ef67e8 sortiere unit.skills nach id. 
TODO: binary search statt linear, read_unit optimization

https://trello.com/c/ydUTDGgl/616-sort-unitskills-binary-search
 2017-09-15 21:52:20 +02:00
Enno Rehling
c5181195d7 new feature: sea serpents will not go after small targets. 2017-09-09 12:58:10 +02:00
Enno Rehling
b9b3f0322e slightly faster lookup for equipment, probably. 2017-09-08 22:24:17 +02:00