Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10367 commits 10 branches 0 tags 41 MiB
Commit graph

10367 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
5119579498 Merge remote-tracking branch 'upstream/master' 2019-07-06 12:08:14 +02:00
Enno Rehling
7eb0e580a0 increase MAXSCHOLARS 2019-07-06 12:05:32 +02:00
Enno Rehling
f677a21541 disable QUIT FACTION with ifdef QUIT_WITH_TRANSFER 2019-07-06 12:02:52 +02:00
Enno Rehling
05b8477b8a STIRB PARTEI hat immer nur eine Einheit übergeben. 2019-07-04 20:44:11 +02:00
Enno Rehling
4ea0e8b723 Merge branch 'master' of github.com:ennorehling/eressea 2019-07-04 20:43:15 +02:00
Enno Rehling
3e0cdbccf1 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-29 20:19:10 +02:00
Enno Rehling
7ca5b269b3
Merge pull request #859 from ennorehling/develop 
more intelligent batching of automated students.
 2019-06-29 20:18:28 +02:00
Enno Rehling
33d3ce8e6a more intelligent batching of automated students. 2019-06-26 21:31:47 +02:00
Enno Rehling
c81d6e5f94
Merge pull request #858 from ennorehling/develop 
Develop
 2019-06-24 21:59:12 +02:00
Enno Rehling
38ff25042b Allow batching of too many students. 
Limit number of batched units to 128.
 2019-06-24 21:41:04 +02:00
Enno Rehling
6e64d749b0 tricks to reduce sizeof(scholar) 2019-06-24 20:51:09 +02:00
Enno Rehling
49e0d402e6 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-06-20 12:25:14 +02:00
Enno Rehling
44d044bdde switch to new order post-processing 2019-06-10 20:42:43 +02:00
Enno Rehling
fdde7c8c44 insert language in orders.db 2019-06-08 12:18:45 +02:00
Enno Rehling
01fda5d3d7 new sqlite schema has faction-no as string 2019-06-08 12:18:45 +02:00
Enno Rehling
cf0a4119d6 new sqlite schema has faction-no as string 2019-06-02 10:03:53 +02:00
Enno Rehling
c0113987db Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-05-26 20:13:34 +02:00
Enno Rehling
e6b84410b9 start work on next major release 2019-05-26 20:13:02 +02:00
Enno Rehling
373942d2c2 Merge remote-tracking branch 'upstream/master' 2019-05-26 20:12:06 +02:00
Enno Rehling
0efbcb35d3 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-26 20:11:37 +02:00
Enno Rehling
a240a05a6f Merge branch 'develop' 2019-05-26 20:01:39 +02:00
Enno Rehling
873086b75c use cadaver for box backups 2019-05-26 20:01:28 +02:00