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

9833 Commits

Author SHA1 Message Date
Enno Rehling a87e9b6c5c simplify the orders.queue locking logic, remove it from python 2019-02-10 09:51:06 +01:00
Enno Rehling 4edff66e61
Merge pull request #834 from ennorehling/master 
hot stuff
 2019-02-02 21:13:05 +01:00
Enno Rehling 97a78ad6b0 Merge branch 'master' of https://github.com/ennorehling/eressea 2019-02-02 20:38:11 +01:00
Enno Rehling af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling ef8139067e
Remove missing package 
Ok
 2019-01-22 16:48:22 +01:00
Enno Rehling dba46ac480 add scan-build to travis build 2019-01-22 16:17:16 +01:00
Enno Rehling 49e186b742
Merge pull request #833 from ennorehling/master 
Simple Bugfix
 2019-01-21 11:07:25 +01:00
Enno Rehling 148146d94e BUG 2540: Vertraute ohne Auraim CR repariert 2019-01-21 11:00:31 +01:00
Enno Rehling 55c8b9f72a fix shellcheck 2019-01-20 03:09:35 +01:00
Enno Rehling 8eba9d6eaf fix getfaction script, return email 2019-01-20 03:06:33 +01:00
Enno Rehling dda0fd9d27 fix sendreport script 2019-01-20 02:48:14 +01:00
Enno Rehling 2564603b67 Merge remote-tracking branch 'upstream/master' 2018-12-15 15:43:34 +01:00
Enno Rehling 0473d76f45
Merge pull request #828 from ennorehling/master 
Vertrautenzauber reparieren.
 2018-12-15 15:40:02 +01:00
Enno Rehling dd7ffb5987 comment copypasta 2018-12-11 19:37:34 +01:00
Enno Rehling f0a1fe6134 BUG 2536 fix broken familiar spellbooks 2018-12-09 20:05:44 +01:00
Enno Rehling 9ae603803f Bug 2533 fix weapon selection 
disable undead_reserve test in master, because it is intermittent.
 2018-12-09 10:21:58 +01:00
Enno Rehling f7b9153083 Merge branch 'master' of https://github.com/ennorehling/eressea 2018-12-09 03:43:42 +01:00
Enno Rehling e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling 07383bd94f fix warning for no orders received 2018-12-06 18:49:10 +01:00
Enno Rehling 290a90ac22 Merge remote-tracking branch 'upstream/master' 2018-12-04 21:14:13 +01:00
Enno Rehling 95498171d7 cppcheck: bug in defense weapon selection 2018-12-04 21:12:39 +01:00
Enno Rehling f46f91e162
Merge pull request #824 from ennorehling/master 
password fixes for 3.18.2
 2018-12-03 21:17:19 +01:00
Enno Rehling 0f95e77a7b BUG 2528: fix windows newlines 2018-12-03 21:05:48 +01:00
Enno Rehling 0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +01:00
Enno Rehling 37f964e0ca Merge remote-tracking branch 'upstream/master' 2018-12-03 16:22:47 +01:00
Enno Rehling 7d9280b463 fix problems with passwords > 15 characters 2018-12-03 10:09:03 +01:00
Enno Rehling 069a94f830
Merge pull request #823 from ennorehling/master 
bugfixes for 3.18.2
 2018-12-02 21:02:25 +01:00
Enno Rehling ae0415cf8d fixing itoa on unix 2018-12-02 20:33:11 +01:00
Enno Rehling c203ffce08 Bug 2526: Fehlende Leerzeichen bei Items. 2018-12-02 17:13:55 +01:00
Enno Rehling 3057031077 Merge branch 'master' of https://github.com/ennorehling/eressea 2018-12-02 16:33:41 +01:00
Enno Rehling ac9db0c87b Bug 2525: fix default oder preservation. 2018-12-02 15:55:01 +01:00
Enno Rehling c856228d5e variable scope reduction 2018-12-02 15:52:16 +01:00
Enno Rehling a9f3592228 Bug 2525: failing test for default orders. 2018-12-02 15:51:35 +01:00
Enno Rehling e58b3acfd7 Merge remote-tracking branch 'upstream/master' 2018-12-01 21:24:24 +01:00
Enno Rehling 22ed6b6c25 Durchreisemeldung Komma 2018-12-01 21:08:32 +01:00
Enno Rehling af5f5bde60 fix python password check scripts 2018-12-01 15:29:47 +01:00
Enno Rehling 0710fb796d
Merge pull request #822 from ennorehling/master 
Bufix LERNE AUTO
 2018-12-01 10:45:36 +01:00
Enno Rehling b74e8c0ebd simpler hack, um den brypt workfactor einzustellen (oder passwort-checks abzuschalten), weil man manchmal halt keine Zeit hat. 2018-12-01 10:30:15 +01:00
Enno Rehling fc23926559 BUG 2520: LERNE AUTO multi-teacher assignment 2018-12-01 10:29:48 +01:00
Enno Rehling 916c626aaa Merge remote-tracking branch 'upstream/master' 2018-11-27 18:59:08 +01:00
Enno Rehling 5873c0252f Merge branch 'develop' 2018-11-27 18:56:01 +01:00
Enno Rehling a2c179db9a
Merge pull request #821 from ennorehling/develop 
bsdstring elimination, renumber crashfix
 2018-11-25 14:25:15 +01:00
Enno Rehling 8c02d14f13 undo the period-at-end fix for region info, a test breaks 2018-11-25 09:38:58 +01:00
Enno Rehling 4c58127ce1 fix renumber parser crash 2018-11-25 09:26:24 +01:00
Enno Rehling aef271fe39 Merge remote-tracking branch 'upstream/master' 2018-11-25 09:26:05 +01:00
Enno Rehling b7275e40f3 fix renumber parser crash 2018-11-25 09:21:37 +01:00
Enno Rehling 8855574938 report.c is the last user of bsdstring 2018-11-24 21:47:27 +01:00
Enno Rehling c757f83a71 eliminate bsdstring from reports.c 
add missing period at end of region info.
 2018-11-24 21:25:46 +01:00
Enno Rehling 26205094dd remove unused function 2018-11-24 19:27:31 +01:00
Enno Rehling c596781aea Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-11-24 19:23:09 +01:00