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

Commit Graph

  • 34e076f75b use luarocks Enno Rehling 2020-04-20 20:58:52 +0200
  • 64a2890c91 convert to lua 5.3 Enno Rehling 2020-04-19 21:35:48 +0200
  • 346d62e1aa Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2020-05-02 11:02:49 +0200
  • 4d3d6a0eb9 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-05-01 17:52:46 +0200
  • d4c299eaf4 use the luarocks path in cron scripts Enno Rehling 2020-05-01 17:50:58 +0200
  • c17a2ffe02 typo in last commit Enno Rehling 2020-05-01 17:46:14 +0200
  • 9f5ffe974f set luarocks path before runnign tests Enno Rehling 2020-05-01 17:41:29 +0200
  • f0387825cb include luarocks in travis Enno Rehling 2020-05-01 17:35:45 +0200
  • fb34d09be6 Merge branch 'luarocks' into develop Enno Rehling 2020-05-01 17:27:19 +0200
  • bd4db1a9d8 no need to modify package.path Enno Rehling 2020-05-01 17:23:00 +0200
  • 8982b64981 install lunitx as part of setup Enno Rehling 2020-05-01 17:12:16 +0200
  • 8a2a8afe01 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-05-01 17:07:15 +0200
  • e337fa996c do not include lunit in the project, use luarocks to install Enno Rehling 2020-05-01 17:06:08 +0200
  • 8bd3cc6bad Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-05-01 17:03:45 +0200
  • 2529a781d8 fix lunit Enno Rehling 2020-04-30 20:01:02 +0200
  • 8e7919f206 clibs submodule update Enno Rehling 2020-04-30 19:46:23 +0200
  • 5fb8757047 make all test modules work with lunitx Enno Rehling 2020-04-22 03:03:44 +0200
  • a977e853b4 es wird immer der erste lange Befehl ausgefuehrt. Enno Rehling 2020-04-18 22:34:12 +0200
  • f5d352b680 use luarocks Enno Rehling 2020-04-20 20:58:52 +0200
  • ef6fa16496 convert to lua 5.3 Enno Rehling 2020-04-19 21:35:48 +0200
  • 9160791ce1
         Merge pull request #900 from ennorehling/develop Enno Rehling 2020-04-18 22:38:25 +0200
  • 260517f8cf es wird immer der erste lange Befehl ausgefuehrt. Enno Rehling 2020-04-18 22:34:12 +0200
  • 9b3958d3d0 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-04-18 16:28:37 +0200
  • 268d93293c Fehlermeldungen für GIB ALLES Entkomplizierung lange Befehle. Enno Rehling 2020-04-18 16:28:23 +0200
  • 63028bdfcc Der Duden sagt, dass ich kein Deutsch kann. https://www.duden.de/haeufige_fehler/der_selbe Enno Rehling 2020-04-05 17:05:05 +0200
  • 83da94a984 Bug 2626, Meldung war doppelt Enno Rehling 2020-04-05 16:57:04 +0200
  • afcd2844fb Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-04-05 16:52:34 +0200
  • 07949a8d33 Merge remote-tracking branch 'upstream/master' Enno Rehling 2020-04-05 16:52:06 +0200
  • a861b92524
         Merge pull request #897 from ennorehling/develop Enno Rehling 2020-03-28 09:40:40 +0100
  • 6ebb5c7591 Merge branch 'ships' into develop Enno Rehling 2020-03-28 09:37:40 +0100
  • edf154f4c7 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-03-28 09:36:48 +0100
  • a019accad3 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-03-28 09:36:32 +0100
  • a60859ad08 ship report crash, fix error number Enno Rehling 2020-03-28 09:05:52 +0100
  • 112126b07b Bug 2653: Fehlermeldungen bei Übergabe von Schiffen. Enno Rehling 2020-03-25 19:20:51 +0100
  • af38880b15 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-03-19 20:28:51 +0100
  • d2cbb8fe25 reduce cron messages Enno Rehling 2020-03-15 14:32:37 +0100
  • f9997e8838
         Merge pull request #899 from ennorehling/master v3.23.2 Enno Rehling 2020-03-14 12:07:07 +0100
  • 2240fb31db Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2020-03-14 12:01:25 +0100
  • 609d0daed3 Merge branch 'master' into develop Enno Rehling 2020-03-14 12:00:41 +0100
  • fd1f3524ef Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-03-14 11:59:46 +0100
  • 8bf8b68571 make parse_token trim ignored characters like zero-width spaces. Enno Rehling 2020-03-14 11:57:29 +0100
  • b09de26d33 update version Enno Rehling 2020-03-14 11:58:39 +0100
  • 34ac5154e7 make parse_token trim ignored characters like zero-width spaces. Enno Rehling 2020-03-14 11:57:29 +0100
  • e6809fa68d Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-03-09 08:40:03 +0100
  • 42280e5ff1 Merge branch 'develop' of github.com:eressea/server into develop Enno Rehling 2020-03-08 10:15:41 +0100
  • 1c11d25082 Merge branch 'master' into develop Enno Rehling 2020-03-08 10:15:29 +0100
  • 1e6f1f8bd8 Merge branch 'master' of github.com:eressea/server v3.23.1 v3.23.0 Enno Rehling 2020-03-08 10:14:54 +0100
  • 4ddfc27525
         Merge pull request #898 from ennorehling/master Enno Rehling 2020-03-08 10:14:39 +0100
  • c4cb44f961 better starting conditions - demons start cloaked - regions have at least 50 trees Enno Rehling 2020-03-08 10:07:04 +0100
  • 48195918bf Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-03-02 21:38:51 +0100
  • bea657b128 Merge branch 'master' into develop Enno Rehling 2020-03-02 21:37:54 +0100
  • eb273422f4 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-03-02 21:37:31 +0100
  • 81a90fc4ae Merge branch 'master' of github.com:eressea/server v3.22.4 Enno Rehling 2020-03-02 21:32:41 +0100
  • a92d756449
         Merge pull request #896 from ennorehling/develop Enno Rehling 2020-03-02 21:32:22 +0100
  • b8205893d2 more unused code removed Enno Rehling 2020-03-02 21:26:21 +0100
  • fe39eb6cf7 remove unused local functions. Enno Rehling 2020-03-02 21:19:02 +0100
  • d5a784f03a
         Merge pull request #895 from ennorehling/master Enno Rehling 2020-03-02 21:17:14 +0100
  • 0bbee5d1ac kill read_orders, rewrite tests to use parseorders. Enno Rehling 2020-03-02 21:05:49 +0100
  • f4af719175 do not read orders when password is wrong Enno Rehling 2020-03-02 20:40:45 +0100
  • c44bff801f
         Merge pull request #894 from ennorehling/develop Enno Rehling 2020-03-01 19:29:45 +0100
  • 64ef6f9c32 change test to match new behavior. Enno Rehling 2020-03-01 19:28:45 +0100
  • b194ed39bd
         Merge pull request #893 from ennorehling/develop Enno Rehling 2020-03-01 18:33:52 +0100
  • eb16d7bf47 Bug 2645 TARNE [Stufe] reagiert auf Talentänderungen. Enno Rehling 2020-03-01 17:55:07 +0100
  • 41cf41120f Bug 2640: Fehler in LERNE AUTO bei teilweisen Lehrern. Enno Rehling 2020-03-01 14:24:21 +0100
  • 6ecd172ff4 LERNE AUTO: fix tests and logic some more. still haven't fixed the actual bug, algorithm is wrong. Enno Rehling 2020-02-25 20:35:55 +0100
  • de8028c5dd remove debug output from cron script Enno Rehling 2020-02-25 19:19:02 +0100
  • b89824f721
         Merge pull request #892 from ennorehling/develop Enno Rehling 2020-02-21 21:14:03 +0100
  • e5e936acc6 Bug 2640: LERNE AUTO sollte nicht alle Einheiten zu Lehrern delegieren. Fixt den konkreten Bug, fühlt sich aber immer noch nach einemn Spezialfall an? Enno Rehling 2020-02-21 21:12:19 +0100
  • 5ee5751475 Keine Befehle löschen, ist nicht nötig und verwirtr nur. Enno Rehling 2020-02-20 21:09:04 +0100
  • 095e3d39ce Bug 2637: Monster sollen sich nicht parteitarnen. Enno Rehling 2020-02-09 15:24:36 +0100
  • 1ce051549c
         Merge pull request #891 from ennorehling/develop Enno Rehling 2020-02-08 22:05:39 +0100
  • 950a7b7f9c fix tests that try to disable mallorn. Enno Rehling 2020-02-08 21:49:42 +0100
  • b1098f7838 broke several monster behaviors, fixed. Enno Rehling 2020-02-08 21:24:07 +0100
  • 3771b88bc6 typo, opps Enno Rehling 2020-02-08 21:02:18 +0100
  • 40d63264d3 bug 2635: let only swimming units attack on ocean. Enno Rehling 2020-02-07 22:12:24 +0100
  • 4886d29401 small code cleanup Enno Rehling 2020-02-02 18:52:30 +0100
  • 855a989971 documentation for how orders work remove unit names from tests. Enno Rehling 2020-02-02 18:48:33 +0100
  • bf867eb2d6 bug 2634 display number of ships to all factions. Enno Rehling 2020-01-31 20:54:32 +0100
  • 63f4853875 crash in quit faction fix test modules that have no setup add test for lazy trolls Enno Rehling 2020-01-26 12:32:31 +0100
  • 2856998801 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-01-26 10:29:29 +0100
  • 2af7a1350b Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-26 10:29:04 +0100
  • 05774a06c6 Merge remote-tracking branch 'upstream/master' Enno Rehling 2020-01-26 10:28:23 +0100
  • 33066a705b Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2020-01-26 10:27:57 +0100
  • 80b8bd7158 Merge branch 'master' into develop Enno Rehling 2020-01-26 10:15:18 +0100
  • 5d3f51178e Merge branch 'master' of github.com:eressea/server v3.22.3 Enno Rehling 2020-01-26 09:20:00 +0100
  • 829ec6a3ad
         Merge pull request #890 from ennorehling/master Enno Rehling 2020-01-26 09:19:52 +0100
  • 9e41f6b0ba Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-01-26 09:12:47 +0100
  • 42e17f3ba9 bug 2221: buildings cannot exceed maxsize. Enno Rehling 2020-01-26 00:34:31 +0100
  • 983a6f5426
         Merge pull request #889 from ennorehling/develop Enno Rehling 2020-01-19 18:34:23 +0100
  • b9153ac920 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-19 18:33:42 +0100
  • e5947f432e fix intermittent test because sometimes regions contained mallorn. Enno Rehling 2020-01-19 18:20:12 +0100
  • ec04bf5035 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-19 16:36:15 +0100
  • 356bb54bf3
         Merge pull request #888 from ennorehling/develop Enno Rehling 2020-01-19 13:56:10 +0100
  • 3efcf97289 Fix for negative tree growth crash. Enno Rehling 2020-01-19 13:45:38 +0100
  • ec0d5b3754 new CR VERSION: remove MESSAGETYPES Enno Rehling 2020-01-19 13:45:19 +0100
  • 54d0784b54 Kampfreport: Jede Partei hilft sich selbst, duh. Enno Rehling 2020-01-18 21:25:40 +0100
  • 010487ac8d
         Merge pull request #887 from ennorehling/develop Enno Rehling 2020-01-18 21:11:55 +0100
  • af50fe65a3 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-18 21:07:17 +0100
  • a94e4219b1 automatic tree growth is a b*tch Enno Rehling 2020-01-18 21:06:48 +0100
  • 87a71d24e6 some english message fixes Enno Rehling 2020-01-18 17:23:51 +0100