Enno Rehling
483a2ba3de
add missing tests for groups.
2014-10-31 19:15:26 +01:00
Enno Rehling
1d7c193de6
more test coverage for resource pooling.
2014-10-31 19:01:13 +01:00
Enno Rehling
2a77f77745
Merge pull request #47 from badgerman/master
...
refactoring, tests, old datafile compatibility.
2014-10-31 17:32:13 +01:00
Enno Rehling
6e24fe9be2
fix gcc build, ebable new test.
2014-10-31 16:51:57 +01:00
Enno Rehling
9848ba08d0
fix gcc and clang builds: missing include
2014-10-31 15:54:25 +01:00
Enno Rehling
997d1ffd4b
Fix some crashes that happened while debugging an old data file.
2014-10-31 15:52:40 +01:00
Enno Rehling
838155179f
fix backwards compatible code for at_permission.
2014-10-31 15:38:53 +01:00
Enno Rehling
cf110d7788
fix allies with null faction (to be resolved later).
2014-10-31 15:38:37 +01:00
Enno Rehling
f27a77d288
refactoring: use add_ally instead of manually crating the structure all over the code.
2014-10-31 15:13:05 +01:00
Enno Rehling
c8d5d52412
add test for pool, fix a problem with (unused) feature that pools from allies.
2014-10-31 07:51:57 +01:00
Enno Rehling
e9c13cc328
cosmetic changes, quick and easy assert to prevent too many magicians.
2014-10-30 17:48:02 +01:00
Enno Rehling
aa4a93435e
add missing tests for contacting during a siege.
2014-10-30 07:50:01 +01:00
Enno Rehling
526c561b90
some minor cleanup in laws.h
2014-10-29 21:08:16 +01:00
Enno Rehling
fe5ea49506
Merge pull request #46 from badgerman/master
...
German keywords in the imperative.
2014-10-29 20:38:26 +01:00
Enno Rehling
9f2d2e0f92
fix broken test that didn't like the new init_locale() requirements.
2014-10-29 20:01:55 +01:00
Enno Rehling
6bd52012c0
read keywords from json configuration, use German imperative forms.
2014-10-29 19:40:09 +01:00
Enno Rehling
f9c5d58f41
read json config file if available.
...
missed an include, broke the build.
2014-10-29 08:30:07 +01:00
Enno Rehling
0aec5592a0
allow json config to contain a list of config files (includes).
2014-10-29 07:50:06 +01:00
Enno Rehling
209776b751
Merge pull request #45 from badgerman/master
...
Bug 2032: Rename FIGHT -> COMBAT, again
2014-10-26 21:38:22 +01:00
Enno Rehling
b67d42b45e
Merge branch 'version-3-3'
2014-10-26 21:19:16 +01:00
Enno Rehling
f3e54e103a
fix a crash when selling nothing.
...
build 687
2014-10-25 23:54:01 +02:00
Enno Rehling
0a1209d031
verify that my plan for making the German infinitive an optional alias will work.
2014-10-23 16:37:00 +02:00
Enno Rehling
f788f19f6c
fix tests that relied on translation structures being statically cached.
...
clean up static cache, add test for German imperative (WIP)
2014-10-23 16:14:01 +02:00
Enno Rehling
96d5544b1f
Bug 2032: rename FIGHT back to COMBAT
2014-10-20 17:13:32 +02:00
Enno Rehling
356697e44e
improve test for attrib::nexttype correctness.
2014-10-19 20:02:06 +02:00
Enno Rehling
eb1d73e2c2
basic test for tolower function.
2014-10-19 06:42:40 +02:00
Enno Rehling
f4f9e74e90
Merge branch 'master' of github.com:eressea/server
2014-10-19 05:56:41 +02:00
Enno Rehling
aadd9377c2
update build number
2014-10-18 21:43:04 +02:00
Enno Rehling
adcd4ec1c6
increase build number.
2014-10-18 21:40:56 +02:00
Enno Rehling
79c8c4a034
fix a crash when testing for the RESHOW ANY command.
...
E2 crashed when no parameter was given.
2014-10-18 21:40:25 +02:00
Enno Rehling
f069df2345
Merge branch 'master' of github.com:eressea/server
2014-10-18 21:37:40 +02:00
Enno Rehling
58547969f8
fix a crash when testing for the RESHOW ANY command.
...
E2 crashed when no parameter was given.
2014-10-18 21:36:46 +02:00
Enno Rehling
c337d3f505
Merge pull request #40 from CTD1/Fix-0001865-for-E2
...
Bug 1865: largest building or region owner pays for certain empty buildings. Fix for E2,
2014-10-18 20:35:51 +02:00
Enno Rehling
e4ab34115b
Merge pull request #44 from badgerman/master
...
Automatic Teaching feature by CTD
2014-10-18 20:32:00 +02:00
Enno Rehling
78db167802
Merge branch 'master' of github.com:badgerman/eressea
2014-10-18 19:57:50 +02:00
Enno Rehling
837227f69c
PR code review comments.
...
- make study rule an enum, for easier debugging
- change parameter name (it's not a type)
2014-10-18 19:53:13 +02:00
Enno Rehling
a09b53c0c4
Merge branch 'Autolehrer' of github.com:CTD1/eressea-server-bugfixing into CTD1-Autolehrer
2014-10-18 19:46:26 +02:00
Enno Rehling
723a9507a3
Merge pull request #43 from badgerman/master
...
Fix FFL_NOTIMEOUT related crash in E2
2014-10-18 19:41:21 +02:00
Enno Rehling
7e1cec33a2
Remove unused gmcmd attributes.
...
use the at_deprecated feature that was built for this purpose.
remove final external dependency on a_free in the code.
2014-10-18 19:23:36 +02:00
Enno Rehling
539d2673f7
fix a crash in E2 caused by the recent removal of FFL_TIMEOUT.
2014-10-18 19:19:21 +02:00
Enno Rehling
5626abd8dc
refactor and kill dead code.
...
indentation normalization, copyright update.
2014-10-18 18:37:44 +02:00
Enno Rehling
a58afb9d15
added test for removal of atributes.
...
refactor existing tests a bit, free up memory.
2014-10-18 17:51:07 +02:00
Enno Rehling
b37e8ac138
add a test for attrib->nexttype.
...
fix gcc build.
2014-10-18 17:12:43 +02:00
Enno Rehling
8f57adaf5b
declare types (gcc failure).
2014-10-18 14:30:07 +02:00
Enno Rehling
74a6bd72c2
additional testing.
2014-10-18 14:16:26 +02:00
Enno Rehling
a86c2d88ab
Test: After a faction is eliminated, nobody should have it as an ally.
2014-10-17 19:56:26 +02:00
CTD
1c8488f2b4
Wenn man 1/2 schreibt
...
sollte auch 1/2 im Code stehen.
2014-10-17 13:54:07 +02:00
CTD
aa07c550ab
Auto Lehrer
...
Config via study.speedup (sollte in E2 und E3 schon mit dem Wert 0 in
der XML stehen)
Wert 1:
Wenn das gerade gelernte Talent wenig Lerntage hat als 1/3 der max.
möglichen (ohne Bonus wie Akademie) hat, dann gibt es die doppelten
Lerntage. Entspricht etwa dem alten Lehrer Schema.
Wert 2: Es werden die Lerntage aller Talente der Einheit als
Vergleichswert genommen, dann aber gegen den halben maximalen
Lerntagewert.
Es werden niemals die Lerntage der aktuellen Stufe mit eingerechnet,
sondern nur die durchschnittlichen Lerntage der bereits fertig gelernten
Stufen.
In E2 sollte der Lehre Befehl deaktiviert werden wenn diese Option
aktiviert wird.
2014-10-17 13:54:00 +02:00
CTD
3d6c499431
Fixeing GCC
...
Das es nicht gut ist wenn max als int in der Funktion definiert ist und
gleichzeitig global als Funktion existiert ist OK, aber warum Travis
chance() nicht kennt verstehe ich nicht, das ist in der rand.h als
extern definiert, sollte also kein Problem sein. Jetzt halt mit
rng_int().
2014-10-17 11:23:49 +02:00
CTD
1c7075573b
Plündern
...
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
2014-10-16 14:45:21 +02:00
