Commit Graph

5287 Commits

Author SHA1 Message Date
Enno Rehling 1371985776 working around a possible bug in gcc 4.9.2-10ubuntu13 2015-05-24 12:20:24 +02:00
Enno Rehling 6260a45be5 running the test 1000 times should not change the result.
if it does, that is because it depends on state (of the random number generator), which is bad and needs to be fixed if it makes the test intermittent.
2015-05-24 11:32:16 +02:00
Enno Rehling 8674fc18c7 ignore gdb_history file 2015-05-24 11:28:58 +02:00
Enno Rehling 4b721e074d diable test_peasantluck, it fails on master
do not load any config for run-tests.lua
2015-05-24 10:31:11 +02:00
Enno Rehling 0b3190605a increase build number: silver weight enabled again, fix keyword crash 2015-03-07 14:15:25 +01:00
Enno Rehling eb282eecb1 fix keyword-buffer overflow 2015-03-07 14:15:12 +01:00
Enno Rehling cad154ac59 re-enable silver weight
Conflicts:
	scripts/tests/e3/rules.lua
	scripts/tests/faction.lua
2015-03-07 13:58:44 +01:00
Enno Rehling 2175dd4e0e Merge branch 'master' of github.com:eressea/server 2015-03-02 23:12:26 +01:00
Enno Rehling 76cce7f239 fix terrible code to avoid gcc 4.9 warning 2015-03-02 23:12:20 +01:00
Enno Rehling 3cbec04f01 Merge pull request #152 from eressea/hotfix-3-4-5
Hotfix 3.4.5
2015-02-22 22:39:04 +01:00
Steffen Mecke d637571a52 fix spy and volcano messages 2015-02-22 21:49:21 +01:00
CTD 53241bc95f Guard chance repaired
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
2015-02-22 21:45:11 +01:00
Enno Rehling 8e34658a6f fix crontab 2015-02-22 16:10:09 +01:00
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
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 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
Steffen Mecke d6500f7e4f fix bug in tests introduced by previous merge 2015-02-09 10:57:03 +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
Enno Rehling db79eb2f28 Merge pull request #129 from badgerman/master
hotfix for 3.4: stork
2015-02-02 21:48:30 +01:00
Enno Rehling cf0529e141 Merge pull request #128 from badgerman/develop
hotfix for version 3.4 (stork)
2015-02-02 21:47:17 +01:00
Enno Rehling 6af7c8f4aa remove french messages that are not french 2015-02-02 21:46:33 +01:00
Enno Rehling 5c975655b1 remove french messages that are not french 2015-02-02 21:45:47 +01:00
Enno Rehling 6150870115 Merge branch 'hotfix-3.4.1' into develop 2015-02-02 21:35:26 +01:00
Enno Rehling 44e1159984 Merge branch 'hotfix-3.4.1' 2015-02-02 21:33:58 +01:00
Steffen Mecke d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling 5c325536c5 Merge pull request #127 from badgerman/develop
fix stork message (mantis 2027)
2015-02-02 20:37:46 +01:00
Enno Rehling 10e8f5c3eb Merge branch 'stm2-stork_fix' into develop 2015-02-02 20:21:02 +01:00
Enno Rehling faf61ae4d2 Merge branch 'stork_fix' of https://github.com/stm2/server into stm2-stork_fix 2015-02-02 20:20:44 +01:00