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 |
|
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 |
|
Enno Rehling
|
37cb1d4b01
|
Merge pull request #126 from badgerman/develop
building types are constructed with sensible defaults
|
2015-02-02 20:18:26 +01:00 |
|
Enno Rehling
|
997d64efc0
|
Merge branch 'btype-ctor' into develop
|
2015-02-02 20:12:26 +01:00 |
|
Enno Rehling
|
a4e6f4874c
|
building type construction is in bt_get_or_create, and only there.
+ not in jsonconf
+ not in xmlreader (no test for this)
|
2015-02-02 19:52:24 +01:00 |
|
Enno Rehling
|
0955dd7f05
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
|
2015-02-02 18:49:00 +01:00 |
|
Enno Rehling
|
4935582d6a
|
Merge branch 'version-3-2'
Conflicts:
s/cron/previews.sh
s/preview
src/economy.c
src/items.c
src/kernel/build.c
src/kernel/config.c
src/laws.c
src/study.c
|
2015-02-02 18:48:14 +01:00 |
|
Enno Rehling
|
eaaffffb43
|
Merge branch 'version-3-1'
Conflicts:
src/laws.c
|
2015-02-02 18:45:53 +01:00 |
|
Enno Rehling
|
a905c786ca
|
Merge branch 'master' of github.com:eressea/server
|
2015-02-02 18:42:39 +01:00 |
|
Steffen Mecke
|
5ff0596517
|
fix stork message (mantis 2027), add tests
|
2015-02-01 19:14:06 +01:00 |
|
Enno Rehling
|
136230f51b
|
Merge pull request #124 from badgerman/master
add a configuration switch to disable force_leave (bug 2059) for now.
|
2015-02-01 13:01:04 +01:00 |
|
Enno Rehling
|
01b46b143b
|
add a configuration switch to disable force_leave (bug 2059) for now.
|
2015-02-01 12:57:54 +01:00 |
|