Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,219 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

10219 Commits

Author SHA1 Message Date
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
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
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