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

755 commits

Author SHA1 Message Date
Enno Rehling
fef57d3fcf factions that idle out gift their stuff to friends 2019-09-15 14:32:48 +02:00
Enno Rehling
21534ca872 concat in Lua is not PHP 2019-09-15 14:30:50 +02:00
Enno Rehling
e90b7acd4c Merge remote-tracking branch 'upstream/master' 2019-09-15 14:17:37 +02:00
Enno Rehling
294e88196c quit faction is still disabled 2019-09-15 14:12:18 +02:00
Enno Rehling
f06fd8945c getn is deprecated 2019-09-15 14:02:53 +02:00
Enno Rehling
e58f51e536 new bindings for allies. 
script to fix damage from bug 2608.
 2019-09-15 14:02:32 +02:00
Enno Rehling
bd25c0bf6e helfe-status nach lua exponieren. 2019-09-15 14:01:33 +02:00
Enno Rehling
ddc8c27489 Bug 2605: testing horses and carts 
fixing indentation in battle.c
 2019-09-12 22:23:50 +02:00
Enno Rehling
cc77ce6f20 Tests für Einheiten mit Pferden. 2019-09-10 06:40:42 +02:00
Enno Rehling
8bed3f3329 fix give_unit test for E3 
extract read_factions from read_game, now small and nice.
 2019-08-25 18:11:14 +02:00
Enno Rehling
cf7971bcfc Tests for GIVE UNIT and groups. 2019-08-25 17:43:18 +02:00
Enno Rehling
e5c4bd5013 fix and improve lighthouse test. 2019-08-20 17:30:21 +02:00
Enno Rehling
878bc653e8 this test no longer applies 2019-08-20 17:25:26 +02:00
Enno Rehling
b53304d82e Schneekugel wirkt auf aktive Vulkane 
https://bugs.eressea.de/view.php?id=2554
 2019-08-13 18:57:17 +02:00
Enno Rehling
35476da96b Merge branch 'master' into develop 2019-07-31 08:44:42 +02:00
Enno Rehling
0fef06a661 Bug 2594: KONTAKTIERE vor STIRB 2019-07-31 08:31:19 +02:00
Enno Rehling
54d7ea19a4 Bug 2591: Datenbank enthält faslches Passwort für neue Parteien. 2019-07-30 15:26:15 +02:00
Enno Rehling
fdfe0d3b35 check MAX_ENTERTAINERS. 
extract recruit from economy.
Bug 2600 (WIP).
 2019-07-29 23:53:59 +02:00
Enno Rehling
f677a21541 disable QUIT FACTION with ifdef QUIT_WITH_TRANSFER 2019-07-06 12:02:52 +02:00
Enno Rehling
a2b89b5354 Merge branch 'master' into develop 2019-04-28 18:31:29 +02:00
Enno Rehling
f89c414bcd Bug 2580: Muschelplateau 2019-04-28 18:30:54 +02:00
Enno Rehling
968f67a567 delete intermittent test: ents have no special guarding powers. 2019-04-27 18:30:30 +02:00
Enno Rehling
21e226b068 Bug 2576: fix indexing of portals. 2019-04-07 16:05:00 +02:00
Enno Rehling
c92f7505e5 Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 15:28:47 +02:00
Enno Rehling
bcca812ecc Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 13:11:02 +02:00
Enno Rehling
9168a25bf2 test debugging 2019-03-24 18:13:42 +01:00
Enno Rehling
5a5a6de69d Merge remote-tracking branch 'upstream/master' 2019-03-03 09:53:40 +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
f054bdf8cf BUG 2549 promote after recruit 
calculating max units before PROMOTE requires that all recruitment has finished.
 2019-03-03 09:41:53 +01:00
Enno Rehling
b5624e6a8a Some tests for WORK and wages. 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
3be5211a53 fix a previously undetected bug in str_strlcpy. 2019-03-03 09:39:51 +01:00
Enno Rehling
5d6147462a disable intermittent check 2019-03-03 09:33:09 +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
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
d5e5993cb0 Some tests for WORK and wages. 2019-01-08 19:51:42 +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
c815916fda Merge branch 'master' into develop 2018-12-09 10:27:53 +01:00
Enno Rehling
9ae603803f Bug 2533 fix weapon selection 
disable undead_reserve test in master, because it is intermittent.
 2018-12-09 10:21:58 +01:00
Enno Rehling
4c19dfecf8 fix a previously undetected bug in str_strlcpy. 2018-11-27 20:01:47 +01:00
Enno Rehling
c7a38e4bdd logic change in last commit: all familiars have an at_mage at creation. 2018-11-22 22:22:40 +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
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
b181618b53 BUG 1877: change non-spell familiars. 
1. mages can have actions when familiars cast spells.
2. familiar spells do not increase magician's costs.
3. improve separation of caster and mage.
 2018-11-15 20:51:42 +01:00
Enno Rehling
2f9325073b test for cart building 2018-11-05 20:30:33 +01:00
Enno Rehling
dac6ef660d Merge branch 'master' into develop 2018-11-04 09:10:54 +01:00
Enno Rehling
89b10ee63d bug 2463 fix xmastrees, fix get_key/set_key 2018-11-03 20:30:57 +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
dc08ba5e98 bug 2510 duplicate region after datafile read 2018-11-03 13:51:10 +01:00
Enno Rehling
6326664b86 BUG 2505 proof by test. 2018-10-28 21:48:52 +01:00
Enno Rehling
281ed3d3e9 Remove remainder of old the tunnel implementation with b:add_action(). 2018-10-14 17:53:48 +02:00
Enno Rehling
d8468dc83f Merge remote-tracking branch 'upstream/develop' into develop 2018-10-13 20:27:42 +02:00
Enno Rehling
92c6fb9bac
Merge branch 'develop' into bug2480 2018-10-13 20:25:13 +02:00
Enno Rehling
772386ffc7 debug logging did not help. nothing unusual here, just weirdly intermittent. 2018-10-12 20:46:48 +02:00
Enno Rehling
e234a0db6f write the htpasswd file, again 2018-09-26 20:21:56 +02:00
Enno Rehling
74aa4bdaf3 bindings for gamedb_update, run after turn. 2018-09-25 20:39:43 +02:00
Enno Rehling
658b47aeb4 remove seaserpent test that is not a test. 2018-09-15 19:12:32 +02:00
Enno Rehling
681cf32e1f remove besiege from keywords[] array 
fix broken at_keys attributes
remove unused global.attribs
 2018-09-15 18:35:27 +02:00
Enno Rehling
d6e8b38724 FOLGE SCHIFF reparieren (hat UFL_LONGORDER getestet). 2018-09-12 20:35:27 +02:00
Steffen Mecke
c15b4c8fbf refactor terminate (calculate_armor/resistance) 2018-09-12 15:11:34 +02:00
Enno Rehling
2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling
9456c4bdc7 fix debug logging. 2018-09-09 15:16:11 +02:00
Enno Rehling
67089aeb8c Bug 2487: Fix LERNE AUTO translations 
Also disallow autolearning expensive skills.
 2018-09-09 15:13:20 +02:00
Steffen Mecke
aed7432bb2 fix magic resistance (bug 2480) 2018-09-04 16:41:46 +02:00
Enno Rehling
fc0616ed1e kill lua triggers for npc logic, never used. 2018-08-03 06:47:29 +02:00
Enno Rehling
e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +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
7eb951544a equip_newunits got called twice. 2018-07-30 22:19:40 +02:00
Enno Rehling
cd6154cae6 fix the lighthouse crash in preview. 2018-07-22 10:55:09 +02:00
Enno Rehling
fc80e4b83e BUG 2462: Leuchtturm meldet keine Landregionen, beschützt Schiffe erst ab Größe 10. 2018-07-17 20:53:34 +02:00
Enno Rehling
64eb545b4a Bug 2460: Startgeschenke 2018-07-12 20:24:23 +02:00
Enno Rehling
6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling
ade7b2ef43 BUG 2446: trade prices not getting read from XML. 2018-06-10 09:58:26 +02:00
Enno Rehling
dfa0ff09d1 Suppress some false positive coverity results. 
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
 2018-05-19 20:53:51 +02:00
Enno Rehling
6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling
409f5df9a9 po export code removed. 2018-05-17 23:29:12 +02:00
Enno Rehling
7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling
064a0872ed Export strings to .po files (WIP). 2018-05-16 21:33:29 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling
9dd38a6593 convert E2 familiars from XML to Lua 2018-05-15 06:58:07 +02:00
Enno Rehling
e46cfa5e77 remove even more equipment xml to Lua 
only familiars still TBD, I think.
 2018-05-14 22:01:32 +02:00
Enno Rehling
40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling
2be0e9bd41 customize equipment for each game, in Lua. 
no more equipment.xml for e3
 2018-05-13 21:58:01 +02:00
Enno Rehling
a741eaca97 equip new orcs in e2 with lua and a hacky callback. 2018-05-13 21:23:54 +02:00
Enno Rehling
1d7318d9b6 test that new orcs have weapon skills. 2018-05-13 20:36:49 +02:00
Enno Rehling
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling
40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling
298e220cfd Oh. E3 hat kein autoseed, ergo kein seed_elf equipment? 2018-05-12 19:18:25 +02:00
Enno Rehling
271352d0ba create a lua module that can handle simple euipments. 
lua test for equip_unit, with callbacks.
 2018-05-12 19:10:40 +02:00
Enno Rehling
89ecc54bdd deal with jsonconf defaults. 2018-05-10 22:20:28 +02:00
Enno Rehling
84bc08a381 all races can be on a boat by default. 
but now MAKETEMP is broken.
prefer assert_(not_)nil over assert_(not_)equal
 2018-05-10 22:10:26 +02:00
Enno Rehling
ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling
2a213d9302 try to analyze intermittent bug on travis 2018-05-10 18:03:47 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
4bcaaa5f79 remove debug code 2018-05-07 20:24:59 +02:00
Enno Rehling
6746401330 BUG 2437: fetch_astral should have no aura cost when given bad units. 2018-05-07 20:22:02 +02:00
Enno Rehling
cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling
14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +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