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

10186 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
2fc9a40961 Merge remote-tracking branch 'origin/master' 2019-07-06 17:35:42 +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
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
373942d2c2 Merge remote-tracking branch 'upstream/master' 2019-05-26 20:12:06 +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
Enno Rehling
96e6f9d687
Merge pull request #857 from ennorehling/develop 
halflings take more hunger damage.
 2019-05-26 19:59:57 +02:00
Enno Rehling
0e888c264f halflings take more hunger damage. 
nobody can die after one week of hunger .
 2019-05-26 19:51:32 +02:00
Enno Rehling
b6a573027a
Merge pull request #856 from ennorehling/develop 
Bugfix: Migranten regenerieren Aura
 2019-05-19 17:41:56 +02:00
Enno Rehling
9f2741f3dc fix any migrants that have received aura. 2019-05-19 15:47:13 +02:00
Enno Rehling
1c01f4d083 fix the fix_fam_spells function (2585 WIP) 2019-05-19 15:28:16 +02:00
Enno Rehling
670aa56d4e fix_fam_spells happy case test (is familiar) 2019-05-19 15:14:01 +02:00
Enno Rehling
cab3f4309f simple test for aurafocus effect on max spellpoints. 2019-05-19 12:38:54 +02:00
Enno Rehling
a35a0ca516 2582 WIP: failing test for regenerate_aura 2019-05-19 10:52:32 +02:00
Enno Rehling
ba457e2df5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-05-18 20:33:11 +02:00
Enno Rehling
bc6f38d9bc remove superfluous race definitions that are not used anywhere. 2019-05-18 20:32:56 +02:00
Enno Rehling
4391ab95fa Bug 2483: FLIEHE als Default für neue Parteien, nicht AGGRESSIV. 2019-05-18 16:16:30 +02:00
Enno Rehling
5ca4edd3df Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-05-18 14:32:58 +02:00
Enno Rehling
c97678843a Merge remote-tracking branch 'upstream/master' 2019-05-18 14:32:43 +02:00
Enno Rehling
42e94ba13e Merge remote-tracking branch 'upstream/develop' into develop 2019-05-18 14:32:14 +02:00
Enno Rehling
500f8eb2ba Merge branch 'master' into develop 2019-05-18 14:31:04 +02:00
Enno Rehling
4e99def119
Merge pull request #854 from ennorehling/master 
Bugfix Vertrauten-Aura
 2019-05-18 13:35:08 +02:00
Enno Rehling
a461bff6f0 Bug 2584: gray mages can regenerate aura. 2019-05-18 13:21:27 +02:00
Enno Rehling
3434bbe67d Bug 2584: failing test for aura regeneration. 2019-05-18 13:21:26 +02:00
Enno Rehling
2018238263 Bug 2584: gray mages can regenerate aura. 2019-05-18 13:16:13 +02:00
Enno Rehling
d2ee91bc88 Bug 2584: failing test for aura regeneration. 2019-05-18 12:56:40 +02:00
Enno Rehling
b0186cab6b
Merge pull request #853 from ennorehling/develop 
bugfixes, order database
 2019-05-11 21:07:13 +02:00
Enno Rehling
48a343db36 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-05-11 20:52:19 +02:00
Enno Rehling
7dbb417b93 Bug 2575 2019-05-11 20:52:06 +02:00
Enno Rehling
93bcf53f96 Merge branch 'master' into develop 2019-05-09 21:57:01 +02:00
Enno Rehling
c5ec577f33 Merge remote-tracking branch 'upstream/master' 2019-05-09 21:56:50 +02:00
Enno Rehling
182d7df480 do not include the database when creating order file the old way 2019-05-09 21:55:45 +02:00
Enno Rehling
5d7ef85fe5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-05-08 21:12:02 +02:00
Enno Rehling
7a59a11c20 Merge branch 'master' into develop 2019-05-08 21:09:39 +02:00
Enno Rehling
3d05dd4484 Merge remote-tracking branch 'upstream/master' 2019-05-08 21:08:48 +02:00
Enno Rehling
ef90806ca0 hold lockfile only during python script 2019-05-08 21:08:14 +02:00