Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10594 commits 10 branches 0 tags 41 MiB
Commit graph

10594 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
346d62e1aa Merge remote-tracking branch 'upstream/develop' into develop 2020-05-02 11:02:49 +02:00
Enno Rehling
4d3d6a0eb9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-01 17:52:46 +02:00
Enno Rehling
d4c299eaf4 use the luarocks path in cron scripts 2020-05-01 17:50:58 +02:00
Enno Rehling
c17a2ffe02 typo in last commit 2020-05-01 17:46:14 +02:00
Enno Rehling
9f5ffe974f set luarocks path before runnign tests 2020-05-01 17:41:29 +02:00
Enno Rehling
f0387825cb include luarocks in travis 2020-05-01 17:35:45 +02:00
Enno Rehling
fb34d09be6 Merge branch 'luarocks' into develop 2020-05-01 17:27:19 +02:00
Enno Rehling
bd4db1a9d8 no need to modify package.path 2020-05-01 17:23:00 +02:00
Enno Rehling
8982b64981 install lunitx as part of setup 2020-05-01 17:12:16 +02:00
Enno Rehling
8a2a8afe01 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-01 17:07:15 +02:00
Enno Rehling
e337fa996c do not include lunit in the project, use luarocks to install 2020-05-01 17:06:08 +02:00
Enno Rehling
8bd3cc6bad Merge branch 'master' of github.com:ennorehling/eressea 2020-05-01 17:03:45 +02:00
Enno Rehling
2529a781d8 fix lunit 2020-04-30 20:01:02 +02:00
Enno Rehling
8e7919f206 clibs submodule update 2020-04-30 19:46:23 +02:00
Enno Rehling
5fb8757047 make all test modules work with lunitx 2020-04-22 03:04:12 +02:00
Enno Rehling
a977e853b4 es wird immer der erste lange Befehl ausgefuehrt. 2020-04-21 21:03:49 +02:00
Enno Rehling
f5d352b680 use luarocks 2020-04-20 20:58:52 +02:00
Enno Rehling
ef6fa16496 convert to lua 5.3 2020-04-19 21:35:48 +02:00
Enno Rehling
9160791ce1
Merge pull request #900 from ennorehling/develop 
Develop
 2020-04-18 22:38:25 +02:00
Enno Rehling
260517f8cf es wird immer der erste lange Befehl ausgefuehrt. 2020-04-18 22:34:12 +02:00
Enno Rehling
9b3958d3d0 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-04-18 16:28:37 +02:00
Enno Rehling
268d93293c Fehlermeldungen für GIB ALLES 
Entkomplizierung lange Befehle.
 2020-04-18 16:28:23 +02:00
Enno Rehling
63028bdfcc Der Duden sagt, dass ich kein Deutsch kann. 
https://www.duden.de/haeufige_fehler/der_selbe
 2020-04-05 17:05:05 +02:00
Enno Rehling
83da94a984 Bug 2626, Meldung war doppelt 2020-04-05 16:57:04 +02:00
Enno Rehling
afcd2844fb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-04-05 16:52:34 +02:00
Enno Rehling
07949a8d33 Merge remote-tracking branch 'upstream/master' 2020-04-05 16:52:06 +02:00
Enno Rehling
a861b92524
Merge pull request #897 from ennorehling/develop 
bugfixes ships, messages
 2020-03-28 09:40:40 +01:00
Enno Rehling
6ebb5c7591 Merge branch 'ships' into develop 2020-03-28 09:37:40 +01:00
Enno Rehling
edf154f4c7 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-03-28 09:36:48 +01:00
Enno Rehling
a019accad3 Merge branch 'master' of github.com:ennorehling/eressea 2020-03-28 09:36:32 +01:00
Enno Rehling
a60859ad08 ship report crash, fix error number 2020-03-28 09:05:52 +01:00
Enno Rehling
112126b07b Bug 2653: Fehlermeldungen bei Übergabe von Schiffen. 2020-03-25 19:20:51 +01:00
Enno Rehling
af38880b15 Merge branch 'master' of github.com:ennorehling/eressea 2020-03-19 20:28:51 +01:00
Enno Rehling
d2cbb8fe25 reduce cron messages 2020-03-15 14:32:37 +01:00
Enno Rehling
f9997e8838
Merge pull request #899 from ennorehling/master 
UTF8 niceties.
 2020-03-14 12:07:07 +01:00
Enno Rehling
2240fb31db Merge remote-tracking branch 'upstream/develop' into develop 2020-03-14 12:01:25 +01:00
Enno Rehling
609d0daed3 Merge branch 'master' into develop 2020-03-14 12:00:41 +01:00
Enno Rehling
fd1f3524ef Merge branch 'master' of github.com:ennorehling/eressea 2020-03-14 11:59:46 +01:00
Enno Rehling
8bf8b68571 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:59:35 +01:00
Enno Rehling
b09de26d33 update version 2020-03-14 11:58:39 +01:00
Enno Rehling
34ac5154e7 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:57:29 +01:00
Enno Rehling
e6809fa68d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-03-09 08:40:03 +01:00
Enno Rehling
42280e5ff1 Merge branch 'develop' of github.com:eressea/server into develop 2020-03-08 10:15:41 +01:00
Enno Rehling
1c11d25082 Merge branch 'master' into develop 2020-03-08 10:15:29 +01:00
Enno Rehling
1e6f1f8bd8 Merge branch 'master' of github.com:eressea/server 2020-03-08 10:14:54 +01:00
Enno Rehling
4ddfc27525
Merge pull request #898 from ennorehling/master 
better starting conditions
 2020-03-08 10:14:39 +01:00
Enno Rehling
c4cb44f961 better starting conditions 
- demons start cloaked
- regions have at least 50 trees
 2020-03-08 10:07:04 +01:00
Enno Rehling
48195918bf Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-03-02 21:38:51 +01:00
Enno Rehling
bea657b128 Merge branch 'master' into develop 2020-03-02 21:37:54 +01:00
Enno Rehling
eb273422f4 Merge branch 'master' of github.com:ennorehling/eressea 2020-03-02 21:37:31 +01:00