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

5327 Commits

Author SHA1 Message Date
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 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 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 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 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
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
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