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

7417 Commits

Author SHA1 Message Date
Enno Rehling 1fe178f2ca Merge pull request #590 from ennorehling/develop 
Bug 2242: codepage conversion creates endless loop
 2016-10-02 13:23:32 +02:00
Enno Rehling fadf591a32 gcc appeasement (overflow in constant conversion). 2016-10-02 13:19:39 +02:00
Enno Rehling 693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00
Enno Rehling 8728fccaec fix an endless loop in unicode_utf8_to_cp437 for characters not in the table. 2016-10-02 12:46:07 +02:00
Enno Rehling 165bd6acaf Merge pull request #589 from ennorehling/develop 
Bug 2239: create snowman with full hitpoints
 2016-10-02 12:03:00 +02:00
Enno Rehling 23b9774495 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-02 11:42:49 +02:00
Enno Rehling 5a129f8bd4 Create the snowman with full hitpoints. 
https://bugs.eressea.de/view.php?id=2239
 2016-10-02 11:42:31 +02:00
Enno Rehling 2bf018d518 Merge pull request #588 from ennorehling/develop 
remove RS_FARVISION, it is the only spell that uses units.
 2016-10-01 21:27:19 +02:00
Enno Rehling c53ac9d8aa remove RS_FARVISION, it is the only spell that uses units. 2016-10-01 21:03:16 +02:00
Enno Rehling 7238e4d81c Merge pull request #587 from ennorehling/develop 
Bug 2240: Tippfehler Steinkreis
 2016-10-01 19:04:10 +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 59d145c4b5 Merge pull request #13 from eressea/develop 
update my fork
 2016-10-01 18:48:15 +02:00
Enno Rehling a8a7f68112 Merge pull request #586 from ennorehling/bug-2234-maintenance-msg 
Bug 2234: building maintenance messages
 2016-10-01 18:43:16 +02:00
Enno Rehling c640fb4be8 compile in the absence of libxml2-dev 2016-10-01 16:39:35 +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 41db460278 Merge pull request #585 from ennorehling/tolua-build 
allow building with lua 5.1 and matching tolua version
 2016-10-01 06:40:38 +02:00
Enno Rehling 4fc4e8a588 change how lua version is determined to work with my mac 2016-09-30 22:21:26 +02:00
Enno Rehling 95872aabb8 try to install libtolua-dev on travis builders 2016-09-30 20:00:48 +00:00
Enno Rehling 04333e71d6 working on a new tolua build step that supports 5.1 2016-09-30 19:47:40 +00:00
Enno Rehling fc6ab724a5 fix the economy test. no idea why it passes now? 
this doesn't represent the bug 2234 that I am trying to repro, yet.
 2016-09-27 15:40:03 +02:00
Enno Rehling f2d0d74e70 fix the test, except it doesn't fail anymore? 2016-09-27 15:02:22 +02:00
Enno Rehling 10806a1d95 add a failing test for bug 2234 2016-09-27 08:25:58 +02:00
Enno Rehling 3bbd2bcce8 Merge pull request #581 from ennorehling/follow-nodrift 
FEATURE: ships that FOLLOW or use PIRACY are not affected by storms.
 2016-09-25 08:37:18 +02:00
Enno Rehling c2f0c82a70 Merge pull request #584 from ennorehling/develop 
some spell-related refactorings
 2016-09-24 19:55:59 +02:00
Enno Rehling 42c44724f8 testing lazy find_spell calls for equipment configuration 2016-09-24 17:29:55 +02:00
Enno Rehling 423e293745 some more config lookup caching 2016-09-23 20:39:08 +02:00
Enno Rehling c606a9ac4d extract RC_SPELL handling into a small function, minimize get_race calls. 2016-09-22 20:22:23 +02:00
Enno Rehling f036b62924 Merge pull request #583 from ennorehling/develop 
NPC races have no recruiting costs
 2016-09-22 20:16:14 +02:00
Enno Rehling 37a5954c20 NPC races cannot be recruited (and provide no score). 2016-09-22 20:11:14 +02:00
Enno Rehling 545bd6b744 Merge pull request #582 from ennorehling/develop 
Bug 2241 and many small race-related fixes
 2016-09-22 18:34:58 +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 2c0f0bfc1e reduce get_race calls by a few more 2016-09-22 15:51:11 +02:00
Enno Rehling b985f9fa3e adding gruenbaer gprof output for historical preservation 2016-09-22 10:12:35 +02:00
Enno Rehling dfab45dc0c actually don't call old_race anymore 2016-09-22 09:41:30 +02:00
Enno Rehling e45dc3d68a initizlize rc_elf 2016-09-22 09:37:54 +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 a3ad9a0222 I am now calling get_race far too often. Fix this a bit. 2016-09-20 20:27:41 +02:00
Enno Rehling 69b420ae2f separate interval generation from seen-markup a bit more. 2016-09-20 15:53:55 +02:00
Enno Rehling a06f73c086 Merge pull request #580 from ennorehling/smart-interval 
SMART_INTERVALS is no longer a define, but official
 2016-09-20 15:46:38 +02:00
Enno Rehling f8ac5c390d SAMRT_INTERVALS is no longer an option, but regular 2016-09-20 09:39:21 +02:00
Enno Rehling b44a249795 Merge pull request #576 from ennorehling/kill-seen-region 
rewrite of report generation. take a deep breath...
 2016-09-20 07:20:05 +02:00
Enno Rehling 73f33a7d0f Merge branch 'develop' 
Conflicts:
	src/kernel/config.c
 2016-09-19 20:22:53 +02:00
Enno Rehling 7d88dddcc3 Merge pull request #578 from ennorehling/cache-buiding-type 
add an API for caching the results of bt_find
 2016-09-19 20:14:27 +02:00
Enno Rehling 98d810dded Merge pull request #579 from ennorehling/cache-curse-type 
add an API for caching the results of ct_find
 2016-09-19 20:14:16 +02:00
Enno Rehling c98f075755 Merge pull request #577 from ennorehling/cache-race 
add an API for caching the results of rc_find
 2016-09-19 20:14:02 +02:00
Enno Rehling 12239178c6 rc_find optimizations in monster AI. 
remove dead alp code.
 2016-09-19 20:10:01 +02:00
Enno Rehling aceb880826 add some TODO and reduce old_race usage. 2016-09-19 18:45:16 +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 043ff40d02 eliminate another call to old_race. 2016-09-19 18:28:44 +02:00