Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,543 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
Enno Rehling 3533291711 remove at_hurting, it was only used by the Temple of Pain, which is no longer in the game. 2016-11-13 18:33:47 +01:00
Enno Rehling 28aa2a56b8 Entferne unbenutztes "Szepter der Tränen". 
Was für eine saublöde Idee.
 2016-11-13 17:49:16 +01:00
Enno Rehling b9f6a3f620 skillpotion appears as a vial to other players. 
https://bugs.eressea.de/view.php?id=2254
 2016-11-05 19:58:18 +01:00
Enno Rehling fec9945458 Fixing Bugs 2246 & 2251 
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
 2016-11-05 18:20:56 +01:00
Enno Rehling 2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling 38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling 530e47efae Tippfehler bei Steinkreis-Weihung. 
https://bugs.eressea.de/view.php?id=2240
 2016-10-01 16:59:19 +00:00
Enno Rehling cbd1e8c457 Fixing https://bugs.eressea.de/view.php?id=2234 
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
 2016-10-01 18:34:38 +02:00
Enno Rehling 37a5954c20 NPC races cannot be recruited (and provide no score). 2016-09-22 20:11:14 +02:00
Enno Rehling 5ccb2c3dc8 remove recruitcost from non-player races. 
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
 2016-09-22 18:28:37 +02:00
Enno Rehling ac4f8d6e7b make monsters scaring peasants a per-race configuration. 
reduce the number of old_race calls that monster.c makes.
 2016-09-22 09:34:23 +02:00
Enno Rehling ff83d5108a remove old_race call form heal_factor 2016-09-22 09:08:02 +02:00
Enno Rehling a7fbe4901b eliminate old_race. make the catdragon act like a dragon. 2016-09-19 18:42:14 +02:00
Enno Rehling 6ec99af4d6 mark all three major dragon types as RCF_DRAGON. 
use RCF_DRGON flag to detemine BP_DRAGON speed.
 2016-09-19 15:53:31 +02:00
Enno Rehling 402c19d8fc dn't warn new player about NMR. 
newbie info text was no longer valid.
 2016-09-11 16:35:55 +02:00
Enno Rehling 3a719226a2 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-01 21:55:52 +02:00
Enno Rehling a75b591784 Fix the nocostbuilding curse description. 
https://bugs.eressea.de/view.php?id=2232
 2016-09-01 20:49:05 +01:00
Enno Rehling ce7eb9663a remove dead phoenix feature. 2016-08-29 20:56:00 +01:00
Enno Rehling 4bc8817056 remove a TODO that was ill-advised. The reason that "resources" is a list is that it's built incrementally. 2016-08-29 18:15:20 +01:00
Enno Rehling ef44a4534e add a test for copying resources message arguments. 
my plan is to add a new argument type for arrays of resources with fewer allocations.
 2016-08-29 17:31:09 +01:00
Enno Rehling 33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01:00
Enno Rehling a42bd9c3bf remove the BLD_WORKING flag. 
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
 2016-08-21 20:12:28 +02:00
Enno Rehling 43090e1492 remove any reference to old two-stage maintenance. 
getting rid of a lot of dead code.
 2016-08-21 20:02:20 +02:00
Enno Rehling 901cf97cb2 refactoring the "nocostbuilding" curse. 
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
 2016-08-21 20:02:19 +02:00
Enno Rehling 238a0e22f2 Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance 
Conflicts:
	src/util/CMakeLists.txt
 2016-08-08 08:46:09 +02:00
Enno Rehling e2808eeea9 reqsize defaults to 1. 
remove default values from xml to make it smaller and simpler.
 2016-08-06 13:53:07 +02:00
Enno Rehling db5b90e80b clarify building_type.maxsize and add error logging for bug 2221. 
https://bugs.eressea.de/view.php?id=2221
 2016-08-06 13:52:29 +02:00
Enno Rehling 3fa34f8238 Merge pull request #494 from stm2/bug_2193 
fixed a few typos in E3 spells (bug 2193)
 2016-07-08 10:31:39 +02:00
Steffen Mecke afdd20c4dd healing potion works once per battle with 100% 2016-06-12 23:23:22 +02:00
Steffen Mecke eaa94086eb one more fix 2016-06-12 00:05:19 +02:00
Enno Rehling 61acd40424 Merge pull request #512 from stm2/dragon_growl 
Dragon growl
 2016-06-11 23:16:23 +02:00
Steffen Mecke c5014fd766 integrated Ennos suggestions for dragon growls 
Dragons now growl 20% more elegantly!
 2016-06-11 13:47:38 +02:00
Enno Rehling 7fd1d3d616 remove ocean from coasts, SEA_REGION is enough 2016-06-10 20:50:22 +02:00
Steffen Mecke ce312afc95 fix dragon growl for regions with an apostrophe 2016-05-31 01:54:06 +02:00
Enno Rehling a834c486d9 fix a FIXME: setting default order through config, making test better. 
this feature is not in use, so all this work is really pointless.
 2016-04-09 19:05:28 +02:00
Enno Rehling be89aaeb83 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-03-26 22:28:14 +01:00
Enno Rehling bc8c39f4bb fix message-crash https://bugs.eressea.de/view.php?id=2199 
release version 3.8.7
 2016-03-26 22:09:21 +01:00
Enno Rehling 75f2be75d8 remove code for alp (non-functional) 
remove code for removecurse trigger (only used by alp)
 2016-03-25 21:18:57 +01:00
Steffen Mecke e143843b2c fixed a few typos in E3 spells (bug 2193) 2016-02-28 14:29:53 +01:00
Enno Rehling b646c9e22e duplicate definition of concealing_aura in E3 2016-01-24 11:44:18 +01:00
Enno Rehling 4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +01:00
Enno Rehling 4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Philipp Dreher 18f2cc1d70 cosmetic changes to iteminfo of skillpotion 2015-12-29 09:43:30 +01:00
Philipp Dreher 7b2aa821d0 Added iteminfo for snowglobe in DE+EN 2015-12-29 09:42:54 +01:00
Enno Rehling 2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling 3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling 810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling acab4b3199 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2015-12-17 20:36:39 +01:00