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

5710 Commits

Author SHA1 Message Date
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
Enno Rehling 89598dd987 Merge pull request #110 from stm2/bug1973 
cr_report should also check if region messages can be heard (bug #1973)
 2015-02-01 12:28:17 +01:00
Enno Rehling ba26897872 Merge branch 'master' of github.com:eressea/server 2015-02-01 12:25:35 +01:00
Enno Rehling 4929ee1e5f Merge branch 'stm2-nr_localization_fix' 2015-02-01 12:24:38 +01:00
Enno Rehling 9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling c75012b61d Merge pull request #119 from stm2/giant_message_typo_fix 
translated English messages and fixed a ton of typos
 2015-02-01 11:44:18 +01:00
Enno Rehling 92c6e1382d Merge pull request #123 from badgerman/master 
small problems found in the last preview before the 3.4 release
 2015-02-01 10:50:03 +01:00
Enno Rehling 025998fa0d Merge branch 'master' of github.com:eressea/server 2015-02-01 10:40:17 +01:00
Enno Rehling 03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling 3fc434e1b9 bug 2072: make peasant growth not spam messages. 2015-02-01 10:27:00 +01:00
Enno Rehling da9c33268c fix preview crash in embassies.lua. 
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
 2015-02-01 10:03:30 +01:00
Enno Rehling b06efdfa75 I cannot get this to work, hacking it 2015-02-01 08:37:04 +01:00
Enno Rehling a567fe9ed0 function is a bash-ism 2015-02-01 08:29:21 +01:00
Enno Rehling 6b1285a784 fix preview script so it can checkout and build from tags 2015-02-01 08:21:07 +01:00
Enno Rehling 5e0c934c6f indentation fixes for this new file 2015-01-30 22:30:11 +01:00
Enno Rehling 02f92f7932 Merge branch 'stm2-peasantgrowth_acceleration' 2015-01-30 22:25:21 +01:00
Enno Rehling df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Enno Rehling c54cbfd472 fix copyright notice 2015-01-30 22:10:29 +01:00