Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 9258613ae9
         Merge pull request #836 from ennorehling/develop Enno Rehling 2019-02-16 20:47:44 +0100
  • d56eee9687 BUG 2504: skeletons can learn. There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit. It's annoying that these flags are in the same int. Enno Rehling 2019-02-16 20:14:34 +0100
  • f744cebe66 fix coverity errors Enno Rehling 2019-02-15 10:07:55 +0100
  • 57c2772baf include expat in dependencies Enno Rehling 2019-02-10 19:21:25 +0100
  • 119e9dbecc remove queue after we are done with it v3.18.6 Enno Rehling 2019-02-10 10:07:08 +0100
  • a87e9b6c5c simplify the orders.queue locking logic, remove it from python Enno Rehling 2019-02-10 09:51:06 +0100
  • 717fe4a803 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2019-02-09 20:50:56 +0100
  • 7490a827d9 Mantis 2552: rewrite goblin stealing to be more readable. Enno Rehling 2019-02-09 20:50:47 +0100
  • a84a89dc51 asciification Enno Rehling 2019-02-09 13:39:28 +0100
  • 5868316537 asciification Enno Rehling 2019-02-09 12:50:12 +0100
  • 642d043e7c asciify more files Enno Rehling 2019-02-07 20:33:20 +0100
  • 35c6f30511 umlaut substitutions Enno Rehling 2019-02-08 11:37:32 +0100
  • 2ecc710122 kaputte umlaute ersetzt, ascii 4 lyfe Enno Rehling 2019-02-07 14:48:51 +0100
  • 793a666969 remove UTF-8 BOM from sources Enno Rehling 2019-02-06 22:29:09 +0100
  • 1ea064d1f5
         Merge pull request #835 from ennorehling/develop Enno Rehling 2019-02-03 04:23:31 +0100
  • e2607a3e7c fix merge error Enno Rehling 2019-02-03 04:17:11 +0100
  • 818b309ebf eliminate warnings from cppcheck Enno Rehling 2019-02-02 21:20:23 +0100
  • 4bb2b5529d Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-02-02 21:19:56 +0100
  • 88dd9203dd Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-02-02 21:18:59 +0100
  • 0043690650 Merge branch 'master' into develop Enno Rehling 2019-02-02 21:17:23 +0100
  • 4edff66e61
         Merge pull request #834 from ennorehling/master v3.18.5 Enno Rehling 2019-02-02 21:13:05 +0100
  • 97a78ad6b0 Merge branch 'master' of https://github.com/ennorehling/eressea Enno Rehling 2019-02-02 20:38:11 +0100
  • af91459fb1 add some variety to familiar selection. effskill: use NULL, not 0 for pointer arguments. Enno Rehling 2019-02-02 20:36:23 +0100
  • 20e0e8400b eliminate MAX/MIN macros completely Enno Rehling 2019-01-24 17:50:58 +0100
  • 9b113c050e eliminate MIN and MAX macros Enno Rehling 2019-01-24 16:34:07 +0100
  • 5a01ea14b6 reserve memory for backtrace before it runs out Enno Rehling 2019-01-24 16:18:58 +0100
  • 5b167077a9 review some flawfinder warnings Enno Rehling 2019-01-24 14:25:58 +0100
  • a4873d7a12 re-undo splint warning fizes Enno Rehling 2019-01-24 14:24:18 +0100
  • 2defef021f fix some weak splint warnings Enno Rehling 2019-01-22 20:37:23 +0100
  • ef8139067e
         Remove missing package Enno Rehling 2019-01-22 16:48:22 +0100
  • dba46ac480 add scan-build to travis build Enno Rehling 2019-01-22 16:17:16 +0100
  • fbdd3c2fee Merge branch 'master' into develop Enno Rehling 2019-01-21 11:10:12 +0100
  • 49e186b742
         Merge pull request #833 from ennorehling/master v3.18.4 Enno Rehling 2019-01-21 11:07:25 +0100
  • 148146d94e BUG 2540: Vertraute ohne Auraim CR repariert Enno Rehling 2019-01-21 11:00:31 +0100
  • 54a43de377 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-01-21 10:47:08 +0100
  • 172387e6bc BUG 2549 promote after recruit calculating max units before PROMOTE requires that all recruitment has finished. Enno Rehling 2019-01-20 16:51:04 +0100
  • f56bbd64c1
         Merge pull request #832 from ennorehling/develop Enno Rehling 2019-01-20 03:12:29 +0100
  • 55c8b9f72a fix shellcheck Enno Rehling 2019-01-20 03:08:37 +0100
  • 8eba9d6eaf fix getfaction script, return email Enno Rehling 2019-01-20 03:06:33 +0100
  • dda0fd9d27 fix sendreport script Enno Rehling 2019-01-20 02:48:14 +0100
  • 5943047745 MSVC debugger gets confused when two structs have the same name Enno Rehling 2019-01-18 22:26:55 +0100
  • 291f2d7113 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2019-01-13 19:19:06 +0100
  • 5648830b4d Vereinfachte Statistik für Durchreiseregionen anzeigen. Enno Rehling 2019-01-13 19:17:31 +0100
  • 10783a05e3 newline after travelthru message Enno Rehling 2019-01-13 09:48:40 +0100
  • 96cf9c3e8d
         Merge pull request #831 from ennorehling/develop Enno Rehling 2019-01-12 21:39:55 +0100
  • f96e88e3e0 write a warning in the template about password replacement. for new factions, put the generated password into the template. normalize and secure password generation. Enno Rehling 2019-01-12 21:26:48 +0100
  • 2477349092 missing newline Enno Rehling 2019-01-12 08:05:05 +0100
  • d5e5993cb0 Some tests for WORK and wages. Enno Rehling 2019-01-08 19:51:42 +0100
  • 946690a805 Check that groups are cleared when units are transferred. Enno Rehling 2019-01-05 14:13:52 +0100
  • 162f927e5a New tests for give_unit and migrants. Enno Rehling 2019-01-04 21:34:37 +0100
  • c214535591 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2018-12-18 16:39:51 +0100
  • a848a1b2ee fix source encodings, break umlauts, ASCII everywhere Enno Rehling 2018-12-17 12:07:38 +0100
  • 45de8535a0 Someone was casting leaveastral with more than 32 arguments recently. Enno Rehling 2018-12-16 16:36:09 +0100
  • 4fee151f35 fix compilation Enno Rehling 2018-12-16 09:48:39 +0100
  • 3fec7eb4e3 starting to see diminishing returns. Enno Rehling 2018-12-15 20:12:53 +0100
  • 7b8bc8af0f more allocation checks. Enno Rehling 2018-12-15 20:01:51 +0100
  • 7ea64be314 code analysis scan. add checks for malloc results. reduce stack size. Enno Rehling 2018-12-15 19:38:40 +0100
  • 933bf2c596 include what you use Enno Rehling 2018-12-15 18:42:31 +0100
  • 48dc5057b3 remove unused function Enno Rehling 2018-12-15 18:17:06 +0100
  • 6bf9bf7f35 readorders was deprecated and is now gone. Enno Rehling 2018-12-15 18:15:39 +0100
  • e7b6bff827 order atoi36 conditions by likeliness. Enno Rehling 2018-12-15 18:14:36 +0100
  • 3e793f11be
         Merge pull request #829 from ennorehling/develop Enno Rehling 2018-12-15 17:52:55 +0100
  • a6a86520d6 Merge branch 'master' into develop Enno Rehling 2018-12-15 15:44:07 +0100
  • 199b9abcf6 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2018-12-15 15:44:02 +0100
  • 2564603b67 Merge remote-tracking branch 'upstream/master' Enno Rehling 2018-12-15 15:43:34 +0100
  • 0473d76f45
         Merge pull request #828 from ennorehling/master v3.18.3 Enno Rehling 2018-12-15 15:40:02 +0100
  • 21c7266a8f cmake (on macOS) already has a FindLua module Enno Rehling 2018-12-12 09:41:21 +0100
  • 54579c95aa Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2018-12-12 09:12:22 +0100
  • 264822a354 reduce variables scope (cppcheck warnings). Enno Rehling 2018-12-11 19:57:27 +0100
  • dd7ffb5987 comment copypasta Enno Rehling 2018-12-11 19:36:07 +0100
  • 6d5ab44411 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2018-12-11 19:36:14 +0100
  • bb5fb78a46 comment copypasta Enno Rehling 2018-12-11 19:36:07 +0100
  • 4e9b4a35c3 do not use macros for va_copy, which is available from C99 on and with gcc >= 3.0. this somehow eliminates bogus cppcheck warnings Enno Rehling 2018-12-11 19:32:10 +0100
  • 494e2054bf Merge branch 'master' into develop Enno Rehling 2018-12-09 20:06:12 +0100
  • f0a1fe6134 BUG 2536 fix broken familiar spellbooks Enno Rehling 2018-12-09 20:05:44 +0100
  • 14444915df stop coverity warning (realloc). Enno Rehling 2018-12-09 18:56:04 +0100
  • 1ca1c7cfea re-enable intermittent test, supplement unit test. Untote reservieren nichts von anderen Einheiten. Enno Rehling 2018-12-09 14:41:14 +0100
  • 6e070849fd
         Merge pull request #827 from ennorehling/develop Enno Rehling 2018-12-09 10:42:14 +0100
  • c867120772 BUG 2535: Anzeige von Kampfzaubern. use sbs_printf where possible. Enno Rehling 2018-12-09 10:30:33 +0100
  • c815916fda Merge branch 'master' into develop Enno Rehling 2018-12-09 10:27:53 +0100
  • 9ae603803f Bug 2533 fix weapon selection disable undead_reserve test in master, because it is intermittent. Enno Rehling 2018-12-09 10:21:58 +0100
  • fdf60c9dd5
         Merge pull request #826 from ennorehling/develop Enno Rehling 2018-12-09 03:54:06 +0100
  • e47da17cc6 Merge branch 'master' into develop Enno Rehling 2018-12-09 03:48:29 +0100
  • f7b9153083 Merge branch 'master' of https://github.com/ennorehling/eressea Enno Rehling 2018-12-09 03:43:42 +0100
  • c27975f01b Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2018-12-09 03:43:10 +0100
  • 089be4bca8 cppcheck style warnings: reduce variable scope Enno Rehling 2018-12-09 03:42:08 +0100
  • 208ed4c74a
         Merge pull request #825 from ennorehling/develop Enno Rehling 2018-12-08 20:15:53 +0100
  • e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. Enno Rehling 2018-12-06 20:04:45 +0100
  • 201a685d12 Merge branch 'master' into develop Enno Rehling 2018-12-06 18:49:43 +0100
  • 07383bd94f fix warning for no orders received v3.18.2 Enno Rehling 2018-12-06 18:49:10 +0100
  • 1a07b3bf66 fix dupe declaration merge snafu Enno Rehling 2018-12-04 21:16:47 +0100
  • c2eaf704d1 Merge branch 'master' into develop Enno Rehling 2018-12-04 21:14:48 +0100
  • 290a90ac22 Merge remote-tracking branch 'upstream/master' Enno Rehling 2018-12-04 21:14:13 +0100
  • 95498171d7 cppcheck: bug in defense weapon selection Enno Rehling 2018-12-04 21:12:39 +0100
  • bf61a2284e Merge branch 'develop' of https://github.com/ennorehling/eressea into develop Enno Rehling 2018-12-04 21:11:50 +0100
  • 2ac6a6826d some static analysis warnings (cppcheck and msvc). Enno Rehling 2018-12-04 21:10:07 +0100
  • f46f91e162
         Merge pull request #824 from ennorehling/master Enno Rehling 2018-12-03 21:17:19 +0100
  • 0f95e77a7b BUG 2528: fix windows newlines Enno Rehling 2018-12-03 21:05:48 +0100
  • 0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. Enno Rehling 2018-12-03 19:19:06 +0100
  • 37f964e0ca Merge remote-tracking branch 'upstream/master' Enno Rehling 2018-12-03 16:22:47 +0100