Enno Rehling
|
854ff47b29
|
Merge pull request #864 from ennorehling/develop
rechenfehler unterhaltung
|
2019-08-06 20:05:41 +02:00 |
Enno Rehling
|
a0bd0378c3
|
rechenfehler unterhaltung
|
2019-08-06 20:04:47 +02:00 |
Enno Rehling
|
eed5cb499c
|
Merge pull request #863 from ennorehling/develop
ongoing changes
|
2019-08-06 18:16:25 +02:00 |
Enno Rehling
|
c714efac36
|
Merge pull request #862 from ennorehling/master
bugfix release
|
2019-08-06 18:16:13 +02:00 |
Enno Rehling
|
c97e881dbf
|
let horses be short, too.
|
2019-08-03 20:58:13 +02:00 |
Enno Rehling
|
8106cf15a1
|
morale is ony [0-10], so unsigned short is more than fine.
|
2019-08-03 15:28:50 +02:00 |
Enno Rehling
|
a51d3edee7
|
region.peasants can be short
|
2019-08-03 15:12:07 +02:00 |
Enno Rehling
|
867dcd27f7
|
512 is not enough economy
|
2019-08-03 10:02:34 +02:00 |
Enno Rehling
|
ef71a78cd0
|
Merge branch 'develop' of github.com:ennorehling/eressea into develop
|
2019-08-02 12:25:25 +02:00 |
Enno Rehling
|
16cad15dec
|
change test for trimming non-printable chars
|
2019-08-02 12:24:32 +02:00 |
Enno Rehling
|
a2a7bc5f61
|
add missing include
|
2019-08-01 23:11:52 +02:00 |
Enno Rehling
|
bcdddd5099
|
Merge branch 'develop' of github.com:ennorehling/eressea into develop
|
2019-08-01 23:02:12 +02:00 |
Enno Rehling
|
0bf1356e60
|
Merge branch 'unicode' into develop
|
2019-08-01 23:01:30 +02:00 |
Enno Rehling
|
964a0586dc
|
fix UTF8 trimming
|
2019-08-01 22:58:20 +02:00 |
Enno Rehling
|
55299346f8
|
use wint_t, not long.
|
2019-08-01 18:49:39 +02:00 |
Enno Rehling
|
35476da96b
|
Merge branch 'master' into develop
|
2019-07-31 08:44:42 +02:00 |
Enno Rehling
|
01110e8676
|
shellcheck: negative exit and -z vs -n
|
2019-07-31 08:44:29 +02:00 |
Enno Rehling
|
ca0b2b69d0
|
shellcheck: negative exit and -z vs -n
|
2019-07-31 08:43:23 +02:00 |
Enno Rehling
|
0fef06a661
|
Bug 2594: KONTAKTIERE vor STIRB
|
2019-07-31 08:31:19 +02:00 |
Enno Rehling
|
54d7ea19a4
|
Bug 2591: Datenbank enthält faslches Passwort für neue Parteien.
|
2019-07-30 15:26:15 +02:00 |
Enno Rehling
|
fcc267160f
|
Merge branch 'develop' of github.com:ennorehling/eressea into develop
|
2019-07-30 11:18:35 +02:00 |
Enno Rehling
|
c880b6c99b
|
merge conflict resolution MAXSCHOLARS
|
2019-07-30 11:18:09 +02:00 |
Enno Rehling
|
909a839adf
|
simplify: WORK and ENTERTAIN use the same request array.
reduce need for global variables.
|
2019-07-30 11:13:25 +02:00 |
Enno Rehling
|
fdfe0d3b35
|
check MAX_ENTERTAINERS.
extract recruit from economy.
Bug 2600 (WIP).
|
2019-07-29 23:53:59 +02:00 |
Enno Rehling
|
28a4cfa55d
|
bug 2597 wormholes teleport more than one unit.
|
2019-07-28 22:32:08 +02:00 |
Enno Rehling
|
7bb17225c9
|
Seaserpents are cannibals.
|
2019-07-28 18:41:26 +02:00 |
Enno Rehling
|
3d57d2b77f
|
Merge branch 'master' of github.com:ennorehling/eressea
|
2019-07-28 12:57:25 +02:00 |
Enno Rehling
|
5cf680997e
|
implement atoi36 with strtol
|
2019-07-28 12:56:59 +02:00 |
Enno Rehling
|
20f9837a89
|
Merge branch 'master' of github.com:ennorehling/eressea
|
2019-07-28 07:48:36 +02:00 |
Enno Rehling
|
0a8fb39d21
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-07-28 07:47:32 +02:00 |
Enno Rehling
|
ccda750c11
|
Merge remote-tracking branch 'upstream/master'
|
2019-07-28 07:47:22 +02:00 |
Enno Rehling
|
bef4b1c234
|
Merge branch 'master' into develop
|
2019-07-28 07:46:43 +02:00 |
Enno Rehling
|
141e95c5c9
|
bugfix: KONTAKTIERE ohne Parameter crasht.
|
2019-07-28 07:43:54 +02:00 |
Enno Rehling
|
ec17e74d6e
|
Merge remote-tracking branch 'upstream/master'
|
2019-07-27 18:38:50 +02:00 |
Enno Rehling
|
b6beb06d37
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-07-27 18:38:25 +02:00 |
Enno Rehling
|
04c06d6b74
|
Merge branch 'master' into develop
|
2019-07-27 18:37:29 +02:00 |
Enno Rehling
|
4e9d35adec
|
Merge pull request #861 from ennorehling/master
golems and workers
|
2019-07-27 18:36:19 +02:00 |
Enno Rehling
|
c3e86ff6da
|
Make the worst-case number of Golems look better.
|
2019-07-27 16:50:45 +02:00 |
Enno Rehling
|
a33ac3b402
|
Increase MAX_WORKERS for Blumenkinder.
|
2019-07-27 09:28:50 +02:00 |
Enno Rehling
|
c70e597b05
|
Update copyright notice with current date.
|
2019-07-14 09:37:35 +02:00 |
Enno Rehling
|
0281ebc44b
|
Bug 2596: Crash durch leeres Banner
https://bugs.eressea.de/view.php?id=2596
|
2019-07-14 09:26:32 +02:00 |
Enno Rehling
|
cb517c45a1
|
iniparser update from upstream
|
2019-07-11 21:02:51 +02:00 |
Enno Rehling
|
0c1253c6e9
|
Merge branch 'master' of github.com:ennorehling/eressea
|
2019-07-06 17:36:38 +02:00 |
Enno Rehling
|
e42aaaf35c
|
Merge remote-tracking branch 'upstream/master'
|
2019-07-06 17:36:21 +02:00 |
Enno Rehling
|
720ba0cec7
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-07-06 17:36:09 +02:00 |
Enno Rehling
|
2fc9a40961
|
Merge remote-tracking branch 'origin/master'
|
2019-07-06 17:35:42 +02:00 |
Enno Rehling
|
d90bb35fd3
|
Merge branch 'master' into develop
|
2019-07-06 17:34:39 +02:00 |
Enno Rehling
|
a364b0d60e
|
Merge pull request #860 from ennorehling/master
Disabling QUIT FACTION
|
2019-07-06 17:31:04 +02:00 |
Enno Rehling
|
26521bcd2b
|
hide unused function
|
2019-07-06 17:30:09 +02:00 |
Enno Rehling
|
3f395541e1
|
Merge branch 'master' of github.com:ennorehling/eressea
|
2019-07-06 12:09:11 +02:00 |