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

Commit Graph

  • f15bc7915b install clang-7 because iwyu is old Enno Rehling 2019-08-12 09:05:20 +0200
  • 4f80569ebf try using iwyu on travis Enno Rehling 2019-08-11 18:03:52 +0200
  • 8bd7a0a157
         Merge pull request #865 from ennorehling/develop Enno Rehling 2019-08-10 05:59:30 +0200
  • b89eed2f2a Bugfix in Berechnung von neuem Entertainment-Code. Enno Rehling 2019-08-10 05:52:34 +0200
  • 55016e8a02 resource leak: forgot to free recruitment data. Enno Rehling 2019-08-10 05:12:46 +0200
  • 061cadfce8 null-pointer check befor strcmp. Enno Rehling 2019-08-10 05:10:00 +0200
  • 12117776a0 ignore some code more points, but leave emoji intact. Enno Rehling 2019-08-08 18:23:31 +0200
  • 854ff47b29
         Merge pull request #864 from ennorehling/develop Enno Rehling 2019-08-06 20:05:41 +0200
  • a0bd0378c3 rechenfehler unterhaltung Enno Rehling 2019-08-06 20:04:47 +0200
  • eed5cb499c
         Merge pull request #863 from ennorehling/develop Enno Rehling 2019-08-06 18:16:25 +0200
  • c714efac36
         Merge pull request #862 from ennorehling/master v3.20.4 Enno Rehling 2019-08-06 18:16:13 +0200
  • c97e881dbf let horses be short, too. Enno Rehling 2019-08-03 20:58:13 +0200
  • 8106cf15a1 morale is ony [0-10], so unsigned short is more than fine. Enno Rehling 2019-08-03 15:28:50 +0200
  • a51d3edee7 region.peasants can be short Enno Rehling 2019-08-03 15:12:07 +0200
  • 867dcd27f7 512 is not enough economy Enno Rehling 2019-08-03 10:02:34 +0200
  • ef71a78cd0 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-08-02 12:25:25 +0200
  • 16cad15dec change test for trimming non-printable chars Enno Rehling 2019-08-02 12:24:32 +0200
  • a2a7bc5f61 add missing include Enno Rehling 2019-08-01 23:11:52 +0200
  • bcdddd5099 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-08-01 23:02:12 +0200
  • 0bf1356e60 Merge branch 'unicode' into develop Enno Rehling 2019-08-01 23:01:30 +0200
  • 964a0586dc fix UTF8 trimming Enno Rehling 2019-08-01 22:58:20 +0200
  • 55299346f8 use wint_t, not long. Enno Rehling 2019-08-01 18:40:42 +0200
  • 35476da96b Merge branch 'master' into develop Enno Rehling 2019-07-31 08:44:42 +0200
  • 01110e8676 shellcheck: negative exit and -z vs -n Enno Rehling 2019-07-31 08:43:23 +0200
  • ca0b2b69d0 shellcheck: negative exit and -z vs -n Enno Rehling 2019-07-31 08:43:23 +0200
  • 0fef06a661 Bug 2594: KONTAKTIERE vor STIRB Enno Rehling 2019-07-31 08:31:19 +0200
  • 54d7ea19a4 Bug 2591: Datenbank enthält faslches Passwort für neue Parteien. Enno Rehling 2019-07-30 15:26:15 +0200
  • fcc267160f Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-07-30 11:18:35 +0200
  • c880b6c99b merge conflict resolution MAXSCHOLARS Enno Rehling 2019-07-30 11:15:41 +0200
  • 909a839adf simplify: WORK and ENTERTAIN use the same request array. reduce need for global variables. Enno Rehling 2019-07-30 11:13:25 +0200
  • fdfe0d3b35 check MAX_ENTERTAINERS. extract recruit from economy. Bug 2600 (WIP). Enno Rehling 2019-07-29 23:53:59 +0200
  • 28a4cfa55d bug 2597 wormholes teleport more than one unit. Enno Rehling 2019-07-28 22:32:08 +0200
  • 7bb17225c9 Seaserpents are cannibals. Enno Rehling 2019-07-28 18:41:26 +0200
  • 3d57d2b77f Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-07-28 12:57:25 +0200
  • 5cf680997e implement atoi36 with strtol Enno Rehling 2019-07-28 12:56:59 +0200
  • 20f9837a89 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-07-28 07:48:36 +0200
  • 0a8fb39d21 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-07-28 07:47:32 +0200
  • ccda750c11 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-07-28 07:47:22 +0200
  • bef4b1c234 Merge branch 'master' into develop Enno Rehling 2019-07-28 07:46:43 +0200
  • 141e95c5c9 bugfix: KONTAKTIERE ohne Parameter crasht. v3.20.3 Enno Rehling 2019-07-28 07:43:54 +0200
  • ec17e74d6e Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-07-27 18:38:50 +0200
  • b6beb06d37 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-07-27 18:38:25 +0200
  • 04c06d6b74 Merge branch 'master' into develop Enno Rehling 2019-07-27 18:37:29 +0200
  • 4e9d35adec
         Merge pull request #861 from ennorehling/master Enno Rehling 2019-07-27 18:36:19 +0200
  • c3e86ff6da Make the worst-case number of Golems look better. Enno Rehling 2019-07-27 16:50:45 +0200
  • a33ac3b402 Increase MAX_WORKERS for Blumenkinder. Enno Rehling 2019-07-27 09:28:50 +0200
  • c70e597b05 Update copyright notice with current date. Enno Rehling 2019-07-14 09:37:35 +0200
  • 0281ebc44b Bug 2596: Crash durch leeres Banner https://bugs.eressea.de/view.php?id=2596 Enno Rehling 2019-07-14 09:26:32 +0200
  • cb517c45a1 iniparser update from upstream Enno Rehling 2019-07-11 21:02:51 +0200
  • 0c1253c6e9 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-07-06 17:36:38 +0200
  • e42aaaf35c Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-07-06 17:36:21 +0200
  • 720ba0cec7 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-07-06 17:36:09 +0200
  • 2fc9a40961 Merge remote-tracking branch 'origin/master' Enno Rehling 2019-07-06 17:35:42 +0200
  • d90bb35fd3 Merge branch 'master' into develop Enno Rehling 2019-07-06 17:34:39 +0200
  • a364b0d60e
         Merge pull request #860 from ennorehling/master v3.20.2 Enno Rehling 2019-07-06 17:31:04 +0200
  • 26521bcd2b hide unused function Enno Rehling 2019-07-06 17:30:09 +0200
  • 3f395541e1 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-07-06 12:09:11 +0200
  • 5119579498 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-07-06 12:08:14 +0200
  • 7eb0e580a0 increase MAXSCHOLARS Enno Rehling 2019-06-22 21:23:07 +0200
  • f677a21541 disable QUIT FACTION with ifdef QUIT_WITH_TRANSFER Enno Rehling 2019-07-06 12:02:52 +0200
  • 05b8477b8a STIRB PARTEI hat immer nur eine Einheit übergeben. Enno Rehling 2019-07-04 20:44:11 +0200
  • 4ea0e8b723 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-07-04 20:43:15 +0200
  • 3e0cdbccf1 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-06-29 20:19:10 +0200
  • 7ca5b269b3
         Merge pull request #859 from ennorehling/develop Enno Rehling 2019-06-29 20:18:28 +0200
  • 33d3ce8e6a more intelligent batching of automated students. Enno Rehling 2019-06-26 21:31:47 +0200
  • c81d6e5f94
         Merge pull request #858 from ennorehling/develop Enno Rehling 2019-06-24 21:59:12 +0200
  • 38ff25042b Allow batching of too many students. Limit number of batched units to 128. Enno Rehling 2019-06-24 21:41:04 +0200
  • 6e64d749b0 tricks to reduce sizeof(scholar) Enno Rehling 2019-06-24 20:51:09 +0200
  • 38fd007d14 increase MAXSCHOLARS v3.20.1 Enno Rehling 2019-06-22 21:23:07 +0200
  • 49e0d402e6 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-06-20 12:25:14 +0200
  • 44d044bdde switch to new order post-processing Enno Rehling 2019-06-10 20:42:43 +0200
  • fdde7c8c44 insert language in orders.db Enno Rehling 2019-06-08 12:18:26 +0200
  • 01fda5d3d7 new sqlite schema has faction-no as string Enno Rehling 2019-06-02 10:03:53 +0200
  • cf0a4119d6 new sqlite schema has faction-no as string Enno Rehling 2019-06-02 10:03:53 +0200
  • c0113987db Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-05-26 20:13:34 +0200
  • e6b84410b9 start work on next major release Enno Rehling 2019-05-26 20:13:02 +0200
  • 373942d2c2 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-26 20:12:06 +0200
  • 0efbcb35d3 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-05-26 20:11:37 +0200
  • a240a05a6f Merge branch 'develop' v3.20.0 Enno Rehling 2019-05-26 20:01:39 +0200
  • 873086b75c use cadaver for box backups Enno Rehling 2019-05-26 20:01:28 +0200
  • 96e6f9d687
         Merge pull request #857 from ennorehling/develop Enno Rehling 2019-05-26 19:59:57 +0200
  • 0e888c264f halflings take more hunger damage. nobody can die after one week of hunger . Enno Rehling 2019-05-26 19:51:32 +0200
  • b6a573027a
         Merge pull request #856 from ennorehling/develop Enno Rehling 2019-05-19 17:41:56 +0200
  • 9f2741f3dc fix any migrants that have received aura. Enno Rehling 2019-05-19 15:47:13 +0200
  • 1c01f4d083 fix the fix_fam_spells function (2585 WIP) Enno Rehling 2019-05-19 15:28:16 +0200
  • 670aa56d4e fix_fam_spells happy case test (is familiar) Enno Rehling 2019-05-19 15:14:01 +0200
  • cab3f4309f simple test for aurafocus effect on max spellpoints. Enno Rehling 2019-05-19 12:38:54 +0200
  • a35a0ca516 2582 WIP: failing test for regenerate_aura Enno Rehling 2019-05-19 10:46:10 +0200
  • ba457e2df5 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-05-18 20:33:11 +0200
  • bc6f38d9bc remove superfluous race definitions that are not used anywhere. Enno Rehling 2019-05-18 19:49:06 +0200
  • 4391ab95fa Bug 2483: FLIEHE als Default für neue Parteien, nicht AGGRESSIV. Enno Rehling 2019-05-18 16:16:30 +0200
  • 5ca4edd3df Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-05-18 14:32:58 +0200
  • c97678843a Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-18 14:32:43 +0200
  • 42e94ba13e Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-05-18 14:32:14 +0200
  • 500f8eb2ba Merge branch 'master' into develop Enno Rehling 2019-05-18 14:31:04 +0200
  • 4e99def119
         Merge pull request #854 from ennorehling/master v3.19.7 Enno Rehling 2019-05-18 13:35:08 +0200
  • a461bff6f0 Bug 2584: gray mages can regenerate aura. Enno Rehling 2019-05-18 13:16:13 +0200
  • 3434bbe67d Bug 2584: failing test for aura regeneration. Enno Rehling 2019-05-18 12:56:40 +0200
  • 2018238263 Bug 2584: gray mages can regenerate aura. Enno Rehling 2019-05-18 13:16:13 +0200
  • d2ee91bc88 Bug 2584: failing test for aura regeneration. Enno Rehling 2019-05-18 12:56:40 +0200