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

10341 Commits

Author SHA1 Message Date
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
Enno Rehling f42df810d6
Merge pull request #846 from ennorehling/develop 
Development ongoing
 2019-04-27 18:43:50 +02:00
Enno Rehling 968f67a567 delete intermittent test: ents have no special guarding powers. 2019-04-27 18:30:30 +02:00
Enno Rehling cffcac8af7 fix binding faction.no to sqlite statement. 2019-04-26 23:54:22 +02:00
Enno Rehling 90cd77c586 preview gets games as arguments, game 4 is over 2019-04-26 18:56:38 +02:00
Enno Rehling 71090d0091 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-04-26 06:22:02 +02:00
Enno Rehling 7e9b9330a3 Merge branch 'master' into develop 2019-04-26 06:14:56 +02:00
Enno Rehling d67c1d9899 Merge remote-tracking branch 'upstream/master' 2019-04-26 06:13:40 +02:00
Enno Rehling 97afaa29c3 increase maximum number of submissions per week from 20 to 30. 2019-04-26 06:10:17 +02:00
Enno Rehling 2442aed1db null pointer handling for strlcpy 2019-04-25 16:31:35 +02:00
Enno Rehling 692cdcea13 Rechtschreibung 
Dragon Evolution: hitpoint tweaking.
 2019-04-25 08:44:48 +02:00
Enno Rehling 5acfdf5cd0 fix unused variable warning. 2019-04-24 15:13:27 +02:00
Enno Rehling 75dfed8082 Leerzeichen aus Beschreibungen trimmen. 2019-04-24 13:09:59 +02:00
Enno Rehling 7298968921 schema version 2 
faction no is a char(4), not an int.
 2019-04-24 08:08:50 +02:00
Enno Rehling d44eb74331 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-04-23 13:19:40 +02:00