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

10405 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
4efe63d3e2
Merge pull request #852 from ennorehling/master 
WIP: implement correct orders.db handling
 2019-05-08 18:43:30 +02:00
Enno Rehling
85a7066ecc move php calls from python to shell script 2019-05-08 18:23:19 +02:00
Enno Rehling
32da0028c1 write to database after the file is created and dated 2019-05-07 21:45:10 +02:00
Enno Rehling
305098c32c do not pollute global namespace with import statements 2019-05-07 20:10:20 +02:00
Enno Rehling
618247e4bf Merge branch 'master' of github.com:ennorehling/eressea 2019-05-07 19:36:50 +02:00
Enno Rehling
0701f895f4 Merge remote-tracking branch 'upstream/master' 2019-05-07 19:35:20 +02:00
Enno Rehling
c5aa6fc940
Merge pull request #851 from ennorehling/develop 
Sonnensegel, STIRB PARTEI
 2019-05-05 20:32:32 +02:00
Enno Rehling
eaddeaa783
Merge pull request #850 from ennorehling/master 
orders-php integration
 2019-05-04 19:01:36 +02:00
Enno Rehling
f5e9bc9696 Merge branch 'orders-db' 2019-05-04 18:54:05 +02:00
Enno Rehling
11b628d092 use the orders databse script if it exists 2019-05-04 17:37:11 +02:00
Enno Rehling
b20e6972a5 write accepted orders to database 2019-05-04 16:21:03 +02:00
Enno Rehling
dbbfc3317e Merge remote-tracking branch 'upstream/master' 2019-05-04 16:20:40 +02:00
Enno Rehling
44713d0aa2
Merge pull request #849 from ennorehling/2541-quit 
2541 STIRB PARTEI
 2019-05-04 14:02:08 +02:00
Enno Rehling
5c7788ecdd Merge branch '2541-quit' into develop 2019-05-04 12:01:55 +02:00
Enno Rehling
cd28f3aee4 heroes lose their status when gifted. 2019-05-04 11:11:30 +02:00
Enno Rehling
2cb4287268 do not transfer migrants. comments are good. 2019-05-04 11:06:56 +02:00
Enno Rehling
8605409ed3 limited-skill units are only transferred up to the limit. 2019-05-04 10:45:51 +02:00
Enno Rehling
6637c94852 do not allow transfer of heros and limited units. 2019-05-01 20:46:26 +02:00
Enno Rehling
0daa0ec04e Rechtschreibung 2019-05-01 20:10:20 +02:00
Enno Rehling
8918f3fa9e Merge branch '2550-shipspeed' into develop 2019-05-01 20:08:49 +02:00
Enno Rehling
7b3b792d01 Nicht Sonnensegel verhindert Sturmelementar, sondern Sturmelementar verhindert Sturmelementar. 2019-05-01 20:08:14 +02:00
Enno Rehling
b13deb2b04 test maximum shipspeed with all modifiers 2019-04-30 22:06:08 +02:00
Enno Rehling
6b93acec08
Merge pull request #848 from ennorehling/master 
2577: Fix resource values, again.
 2019-04-30 19:00:34 +02:00
Enno Rehling
ab58dd6e3a Merge branch 'master' of github.com:ennorehling/eressea 2019-04-30 19:00:33 +02:00
Enno Rehling
505ad39ddf coverity cert hack 2019-04-30 19:00:11 +02:00
Enno Rehling
5cde26e25e preview gets games as arguments, game 4 is over 2019-04-30 19:00:11 +02:00
Enno Rehling
8c0fc4bd91 2577: Fix resource values, again. 2019-04-30 18:56:37 +02:00
Enno Rehling
bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] 2019-04-30 18:40:24 +02:00
Enno Rehling
0e1b61e00e
Merge pull request #847 from ennorehling/master 
bugfix muschelplateau
 2019-04-28 23:14:37 +02:00
Enno Rehling
a2b89b5354 Merge branch 'master' into develop 2019-04-28 18:31:29 +02:00
Enno Rehling
46f1d36c17 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-28 18:31:13 +02:00
Enno Rehling
f89c414bcd Bug 2580: Muschelplateau 2019-04-28 18:30:54 +02:00