Enno Rehling
|
72a1877d26
|
Merge pull request #706 from ennorehling/2331-undead-give
BUG 2331: allow GIVE PERSON for undead units
|
2017-07-09 15:38:04 +02:00 |
Enno Rehling
|
2107a84b0d
|
also allow GIVE for ghouls and skeletons.
|
2017-07-09 15:25:33 +02:00 |
Enno Rehling
|
60efb12d70
|
Zombies koennen Personen gebn
|
2017-07-09 13:37:46 +02:00 |
Enno Rehling
|
d717c6a43a
|
Merge pull request #705 from ennorehling/develop
bring develop branch up to date.
|
2017-07-09 10:50:45 +02:00 |
Enno Rehling
|
de1e0ae916
|
fix indentation
|
2017-07-09 10:43:53 +02:00 |
Enno Rehling
|
6fa471bb97
|
merge conflicts from the 13.2.3 release
|
2017-07-09 10:42:10 +02:00 |
Enno Rehling
|
7790ebd671
|
Valenar crash: bad report interval when a faction has no units.
|
2017-06-26 20:39:05 +02:00 |
Enno Rehling
|
beecc0e323
|
BUG 2343: fix clone_men (hitpoints), add test.
|
2017-06-25 14:07:50 +02:00 |
Enno Rehling
|
2dab88b118
|
cmistake no return value, no mistakes
|
2017-06-25 08:21:14 +02:00 |
Enno Rehling
|
efd826c0a2
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-06-24 22:10:39 +02:00 |
Enno Rehling
|
0593378df0
|
Merge branch 'master' into develop
|
2017-06-24 22:10:05 +02:00 |
Enno Rehling
|
c856283aca
|
Merge pull request #703 from ennorehling/master
BUG 2344: GIB KOMMANDO und ! Präfix
|
2017-06-24 22:08:14 +02:00 |
Enno Rehling
|
1e78414562
|
BUG 2344: GIB KOMMANDO und ! Präfix
|
2017-06-24 22:02:07 +02:00 |
Enno Rehling
|
5f2d1347ae
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-06-24 14:51:48 +02:00 |
Enno Rehling
|
0ebb9dfcce
|
Merge pull request #702 from ennorehling/2342-plant
BUG 2342: PFLANZE vs ZUECHTE Trennung
|
2017-06-24 13:47:52 +02:00 |
Enno Rehling
|
1273abb967
|
Getrennte Befehle fuer PFLANZE und ZUECHTE
|
2017-06-24 13:36:18 +02:00 |
Enno Rehling
|
60c939289c
|
Merge pull request #701 from ennorehling/develop
merge hotfixes back into develop
|
2017-06-18 22:12:39 +02:00 |
Enno Rehling
|
82205f5ce3
|
Merge pull request #700 from ennorehling/master
Version 3.12.2 - regression fixes
|
2017-06-18 22:07:01 +02:00 |
Enno Rehling
|
3ceeb54006
|
Merge branch 'master' into develop
|
2017-06-18 22:05:20 +02:00 |
Enno Rehling
|
2737f39029
|
Merge branch 'master' of https://github.com/ennorehling/eressea.git
|
2017-06-18 21:59:10 +02:00 |
Enno Rehling
|
75ae22e5b6
|
BUG 2340: endloser Sturmelementar
CURSE_NOAGE is a weird thing.
|
2017-06-18 21:48:47 +02:00 |
Enno Rehling
|
147af9ecda
|
Merge remote-tracking branch 'upstream/master'
|
2017-06-18 16:44:58 +02:00 |
Enno Rehling
|
8178f3f1e6
|
BUG 2334: Nochmal Ponnuki
Monsters cannot attack or guard when they are fleeing
|
2017-06-18 14:20:01 +02:00 |
Enno Rehling
|
eed93b7470
|
BUG 2334 and 2339: fix script update and init calls
Ponnuki and Portals scripts are working.
Ponnuki may still attack? More testing required.
|
2017-06-18 12:23:19 +02:00 |
Enno Rehling
|
69ef2c7ce7
|
Merge branch 'master' into develop
Conflicts:
src/magic.c
|
2017-06-18 01:11:40 +02:00 |
Enno Rehling
|
843fbbc5f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-06-18 01:10:57 +02:00 |
Enno Rehling
|
802dfbe124
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-06-18 01:10:35 +02:00 |
Enno Rehling
|
7c5427d4cc
|
Merge pull request #699 from ennorehling/master
BUG 2322, 2332, 2333
|
2017-06-11 20:51:26 +02:00 |
Enno Rehling
|
3ec1476da2
|
improve the mailcmd test
|
2017-06-11 17:13:31 +02:00 |
Enno Rehling
|
f6ba5b6a53
|
BUG 2333 NMR-Anzahl im WB falsch
https://bugs.eressea.de/view.php?id=2333
|
2017-06-11 17:06:13 +02:00 |
Enno Rehling
|
bcf103f581
|
fix raindance_effect message in E2
|
2017-06-11 15:17:04 +02:00 |
Enno Rehling
|
2c9c4c23f0
|
convert warning to debug output
|
2017-06-11 14:47:33 +02:00 |
Enno Rehling
|
72d46df7d7
|
Merge pull request #698 from ennorehling/develop
fix failing preview build for E2 turn 1028
|
2017-06-04 14:40:09 +02:00 |
Enno Rehling
|
3e0bc4f26d
|
cannot assert that free_unit has no faction (complicated reasons)
|
2017-06-04 14:35:15 +02:00 |
Enno Rehling
|
728f7ed389
|
Revert "fix some failing tests."
This reverts commit 8c11cb676f .
|
2017-06-04 14:33:13 +02:00 |
Enno Rehling
|
8c11cb676f
|
fix some failing tests.
|
2017-06-04 14:18:28 +02:00 |
Enno Rehling
|
5b807e2057
|
crash casued by spell conversion.
remove unit from faction, not only region!
also remove spammy warning that has no value.
|
2017-06-04 14:13:05 +02:00 |
Enno Rehling
|
06d7b7f9f1
|
Merge pull request #697 from ennorehling/develop
begin work on 3.13 release
|
2017-05-28 13:02:56 +02:00 |
Enno Rehling
|
1687e31d5f
|
starting a new release
|
2017-05-28 12:51:41 +02:00 |
Enno Rehling
|
8052ff8b23
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-05-28 12:50:51 +02:00 |
Enno Rehling
|
3306488641
|
Merge pull request #695 from ennorehling/feature/refactor-rcspell
refactor observers, lighthouses
|
2017-05-28 12:50:05 +02:00 |
Enno Rehling
|
383866c44b
|
Merge pull request #694 from ennorehling/feature/2326-undeadhero
BUG 2326: counting undead heroes in battle summary
|
2017-05-28 12:49:46 +02:00 |
Enno Rehling
|
797169c7bd
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-05-28 12:48:25 +02:00 |
Enno Rehling
|
025a04a5e9
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
scripts/tests/common.lua
|
2017-05-28 12:47:54 +02:00 |
Enno Rehling
|
b266509746
|
Einheitenlimit anheben (3000 und 500)
|
2017-05-27 20:07:36 +02:00 |
Enno Rehling
|
9e213d3bcd
|
minor optimization and using fraction code
|
2017-05-26 19:05:46 +02:00 |
Enno Rehling
|
a3ebddeae4
|
update cron to check environment for switches
use server/bin instead of ~/bin
|
2017-05-26 13:52:55 +02:00 |
Enno Rehling
|
4efe6f6a71
|
Merge pull request #696 from ennorehling/develop
BUG 2328: absolutely final changes for 3.12
|
2017-05-26 06:35:22 +02:00 |
Enno Rehling
|
b0b9eec05d
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2017-05-26 06:27:31 +02:00 |
Enno Rehling
|
8e15487a1e
|
BUG 2328: wrong calendar seasons.
|
2017-05-26 06:27:25 +02:00 |