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

5447 Commits

Author SHA1 Message Date
Enno Rehling e31737db7c Merge pull request #147 from badgerman/hotfix-3.4.4 
Hotfix 3.4.4, guards
 2015-02-20 20:22:59 +01:00
Enno Rehling 414573d2cc Merge branch 'stm2-message_fix' into develop 2015-02-20 20:15:58 +01:00
Enno Rehling b7de307385 Merge branch 'message_fix' of https://github.com/stm2/server into stm2-message_fix 2015-02-20 20:05:44 +01:00
Enno Rehling cbb88d0d11 Merge pull request #150 from badgerman/bug-2077-ents 
Bug 2077: ents were created as undead
 2015-02-19 19:32:59 +01:00
Enno Rehling 4eed731b8f repair bad ents, do not create them as undead. 2015-02-19 17:30:13 +01:00
Enno Rehling ea580a2836 Merge pull request #140 from stm2/heroes_recruit 
fix heroes must not recruit
 2015-02-16 22:37:44 +01:00
Steffen Mecke 78d4d2fc1b add test for hero recruits 2015-02-16 20:44:03 +01:00
Enno Rehling 0a54cf9c79 Merge pull request #149 from badgerman/tests-exit-code 
fixing exit code of test scripts
 2015-02-16 17:16:19 +01:00
Enno Rehling 426aeee076 Make tests return the number of errors as exit code. 2015-02-16 16:59:07 +01:00
CTD 58fae8e90d Guard chance repaired 
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
 2015-02-15 18:27:54 +01:00
Enno Rehling f6e37bd875 bump build number 2015-02-15 18:27:26 +01:00
Enno Rehling e014485f3c Merge remote-tracking branch 'upstream/develop' into develop 2015-02-15 18:24:33 +01:00
Enno Rehling 4e63febdb8 Merge pull request #146 from CTD1/bewegung_blockiert_von 
Guard chance repaired
 2015-02-15 18:22:38 +01:00
CTD a78cabd5a0 Guard chance repaired 
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
 2015-02-13 16:22:52 +01:00
CTD 8f21aa7a11 repairing lua tests 
Das ist totales Chaos, viele Testcases wurden einfach nicht ausgeführt
weil sie nicht in den init files stehen.
Etwas neu strukturiert, Test laufen jetzt auch wenn sie nicht aus dem
eressea root Ordner gestartet werden wie in s/runtest und es sind einige
Testcases mehr als bisher. Auch macht Travis jetzt die E3 Test. Dabei
ist ein schwerwiegender Fehler beim neuen Bewache aufgefallen!
 2015-02-13 16:03:05 +01:00
Enno Rehling 82f30288f8 Merge pull request #143 from stm2/monster_names 
addendum to monster name fix
 2015-02-12 10:30:57 +01:00
Steffen Mecke d416a8eef1 fix NAME FOREIGN UNIT 
RENAME FOREIGN UNIT used a somewhat naive approach to check if a
unit still had its generic name. Fixed that.
 2015-02-11 23:10:43 +01:00
Steffen Mecke a31898ceb5 fix bug in generic_name, minor improvements 
Amusingly, names::generic_name used u->no instead of u->number to determine
singular or plural.
 2015-02-11 23:10:27 +01:00
Enno Rehling 61bc401095 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-11 18:33:34 +01:00
Enno Rehling 6f2b122f18 Merge pull request #142 from badgerman/bug-1802-unitname 
Bug 1802: unit names do not show up in CR
 2015-02-11 18:32:55 +01:00
Enno Rehling 361e784ae3 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-11 18:17:01 +01:00
Enno Rehling 1c564caf86 Merge pull request #141 from stm2/fix_testsbug_develop 
fix bug in tests introduced by previous merge
 2015-02-11 18:06:39 +01:00
Enno Rehling 5dee3caab8 Merge pull request #139 from stm2/fix_testsbug 
fix bug in tests introduced by previous merge
 2015-02-11 18:06:36 +01:00
Enno Rehling 83e610ee03 Fixing bug 1802 again, CR contains no Monster names. 2015-02-11 07:57:38 +01:00
Steffen Mecke b5f8be8a95 fix heroes must not recruit 2015-02-10 18:17:58 +01:00
Steffen Mecke d6500f7e4f fix bug in tests introduced by previous merge 2015-02-09 10:57:03 +01:00
Steffen Mecke 7fd32e425a fix spy and volcano messages 2015-02-09 09:15:43 +01:00
Enno Rehling 2481f46199 Merge remote-tracking branch 'upstream/master' into develop 2015-02-08 22:09:00 +01:00
Enno Rehling f2434346c9 fix the crontab, again 2015-02-08 21:49:50 +01:00
Enno Rehling 8c606a59fb fix crontab switches 2015-02-08 21:22:39 +01:00
Enno Rehling dd586f7203 re-enable sending reports 2015-02-08 14:01:22 +01:00
Enno Rehling fea5d86690 Merge branch 'setup-cronjob' 2015-02-08 13:56:56 +01:00
Enno Rehling 7b41a53d2a Merge branch 'master' into setup-cronjob 
Conflicts:
	src/buildno.h
 2015-02-08 13:56:49 +01:00
Enno Rehling e85c1778eb Merge pull request #136 from badgerman/hotfix-3.4.2 
Fix broken syntax in message about effects on units.
 2015-02-08 13:44:17 +01:00
Enno Rehling 30f5fbd4ca work around gcc being nervous when static functions are unused. 2015-02-08 13:42:04 +01:00
Enno Rehling 39806eaef5 disable broken test_luck_message for now. 2015-02-08 13:37:44 +01:00
Enno Rehling a2e071d35b Fix broken syntax in message about effects on units. 
Add some missing descriptions.
Bump version number.
 2015-02-08 13:09:04 +01:00
Enno Rehling c8f4204abe fix install process to include json files 2015-02-08 12:05:50 +01:00
Enno Rehling aa950b6b50 Merge branch 'badgerman-hotfix-3.4.1' 2015-02-08 10:51:52 +01:00
Enno Rehling d7804b3556 Merge branch 'hotfix-3.4.1' of https://github.com/badgerman/eressea into badgerman-hotfix-3.4.1 
Conflicts:
	src/buildno.h
	src/tests.c
 2015-02-08 10:50:31 +01:00
Enno Rehling 954a649d3f version number bump 2015-02-08 10:41:05 +01:00
Enno Rehling 742f464ee5 further fixes to the crontab system 2015-02-08 10:35:59 +01:00
Enno Rehling f9bced467d fix a crash in rename_cmd 2015-02-08 10:33:45 +01:00
Enno Rehling 741cb30e90 clean up cron jobs, add crontab, add flag to disable jobs 2015-02-07 19:39:44 +01:00
Enno Rehling 84da00f62d increase version number for develop branch 2015-02-06 01:42:12 +01:00
Enno Rehling 6953ad4403 Merge branch 'develop' of github.com:eressea/server 2015-02-06 01:40:51 +01:00
Enno Rehling fecbac86bc update version number, make preview script use the correct branch 2015-02-06 01:40:03 +01:00
Enno Rehling 308a63668b Merge pull request #134 from badgerman/stype-ctor 
shiptype constructor default initialization
 2015-02-06 01:08:01 +01:00
Enno Rehling e0cb2c9332 add a test for json configuration leaving the ship alone if it has no data. 2015-02-03 17:13:30 +01:00
Enno Rehling 605711c13a constructor st_get_or_create sets ship_type to default values 
xmlreader does not mess with values already set.
 2015-02-03 17:10:29 +01:00