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

5597 Commits

Author SHA1 Message Date
Enno Rehling 168fa02e68 for reasons, sometimes libxml2 is not compile, and all tests will fail. detect that. 2015-04-06 17:49:40 +02:00
Enno Rehling 4fb0c133e8 enable json reports for develop branch 2015-04-05 12:50:10 +02:00
Enno Rehling 82926318c0 fix creating factions with invalid race (return nil) 2015-04-04 15:08:35 +02:00
Enno Rehling 4513a8749b Merge pull request #161 from badgerman/develop 
remove the (broken) summon_alp spell
 2015-04-04 11:05:04 +02:00
Enno Rehling 88a6813358 Merge remote-tracking branch 'upstream/develop' into develop 2015-04-04 11:04:29 +02:00
Enno Rehling 7e92e6501c remove the (broken) summon_alp spell, by request 
https://bugs.eressea.de/view.php?id=2086
 2015-04-04 11:02:56 +02:00
Enno Rehling cda55ef8fb Merge pull request #160 from badgerman/feature-jsreport 
JSON reports
 2015-04-04 09:39:36 +02:00
Enno Rehling bd3c9f1fcb Merge pull request #159 from badgerman/develop 
remove the change_locales code
 2015-04-04 09:21:42 +02:00
Enno Rehling d8c1f03f55 new module to enable jsreport for selected factions. 2015-04-04 09:19:10 +02:00
Enno Rehling 757e196973 remove the change_locales code, this feature was moved in eressea/locales.lua some time ago 2015-04-04 08:55:58 +02:00
Enno Rehling 9664f2b191 Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
Enno Rehling d802b297e9 Merge branch 'develop' of github.com:eressea/server into develop 2015-03-19 15:31:33 +01:00
Enno Rehling 9b64269b6d fix auto-study plus-equal typo 2015-03-19 15:31:25 +01:00
Enno Rehling 878a7394a9 Merge pull request #158 from badgerman/develop 
bug 2068: select familiars by race of mage, not faction.
 2015-03-13 23:01:25 +01:00
Enno Rehling a2a0bbad6a bug 2068: select familiars by race of mage, not faction. 
https://bugs.eressea.de/view.php?id=2068
 2015-03-13 22:14:01 +01:00
Enno Rehling fdc58f0b8b Merge pull request #157 from badgerman/develop 
Make transfer of people configurable, and free in E2
 2015-03-13 22:13:07 +01:00
Enno Rehling 4d18fe68f8 gcc language purity complaint. 2015-03-13 21:56:18 +01:00
Enno Rehling 293190703f make maximum number of people transferred to a faction configurable 
make E2 transfers basically unlimited.
 2015-03-13 21:10:39 +01:00
Enno Rehling 8edafa19c5 fix faction.create locale handling 2015-03-13 20:39:36 +01:00
Enno Rehling 654ee9e6bf minimal script to load configuration in an interactive session 2015-03-07 14:33:38 +01: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 677f0903cb fix broken tests (they were fixed in master, but not in develop?) 2015-03-07 14:11:32 +01:00
Enno Rehling bd11de5a96 Merge branch 'develop' of github.com:eressea/server into develop 2015-03-07 13:59:08 +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 491f6f2cb3 re-enable silver weight 2015-03-07 13:56:31 +01:00
Enno Rehling 02e43d2772 fix a crash in the ancient wedding code? 2015-03-06 22:38:27 +01:00
Enno Rehling ed84e9a2b3 Merge pull request #155 from badgerman/feature-mac-build 
Fixing the build on MacOS
 2015-03-06 19:49:03 +01:00
Enno Rehling 4ce2429276 fix keyword-buffer overflow 2015-03-04 22:19:11 +01:00
Enno Rehling 658c7c9f96 forgot to declare cmakedefine variables for Mac build 2015-03-03 07:04:11 +01:00
Enno Rehling 2349665816 Merge branch 'feature-mac-build' of github.com:badgerman/eressea into feature-mac-build 2015-03-03 00:10:31 +01:00
Enno Rehling 7ae7fa24d8 don't call nproc if the system doesn't have it 2015-03-03 00:10:10 +01:00
Enno Rehling 6a5458c119 fix BSD string function detection 2015-03-03 00:10:10 +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 1ec7a68b07 fix terrible code to avoid gcc 4.9 warning 2015-03-02 23:12:02 +01:00
Enno Rehling 48ea310364 don't call nproc if the system doesn't have it 2015-03-02 22:56:35 +01:00
Enno Rehling 86b0febac0 fix BSD string function detection 2015-03-02 18:37:50 +01:00
Enno Rehling 3ee07a795d somehow broke region.c, cannot explain how that happened 2015-02-23 15:53:55 +01:00
Enno Rehling e2421b3fe7 make lua errors show up on stderr, always (log_fatal). 
this could have been prettier. log.c could use some loving.
 2015-02-23 02:47:08 +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
Enno Rehling 60366ccb06 Merge pull request #153 from eressea/hotfix-3-4-5 
merge changes from hotfix 3.4.5 into develop
 2015-02-22 22:38:53 +01:00
Enno Rehling b68e2a983e added tests to make sure volcanooutbreak and spyreport are no longer empty messages. 2015-02-22 22:31:50 +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 da84808661 fix crontab 2015-02-22 16:09:36 +01:00
Enno Rehling ffbfdee4ff whitespace changes 2015-02-20 20:35:02 +01:00
Enno Rehling 1265daa3c6 Merge branch 'CTD1-repairing_lua_tests' into develop 2015-02-20 20:28:50 +01:00
Enno Rehling 45b77c9993 Merge branch 'repairing_lua_tests' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-repairing_lua_tests 
Conflicts:
	scripts/run-tests.lua
 2015-02-20 20:28:36 +01:00