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

10677 Commits

Author SHA1 Message Date
Enno Rehling dc466fef5d join_monsters merge conflict 2020-05-23 10:19:39 +02:00
Enno Rehling c53aa27597 bug 2661: desertierende einheiten, spoils 
Kampfstatus und Tarnung setzen.
Spoils-Texte für mehr Rassen.
 2020-05-23 10:18:18 +02:00
Enno Rehling 6fc391d93b
Merge pull request #905 from ennorehling/develop 
races in creport
 2020-05-10 18:43:34 +02:00
Enno Rehling 576d4c79fb
Merge pull request #904 from ennorehling/master 
Fix demon stealth in English reports.
 2020-05-10 18:43:26 +02:00
Enno Rehling 2d849b17d7 Merge branch 'master' into develop 2020-05-10 18:01:43 +02:00
Enno Rehling be57a58b39 Merge branch 'master' of github.com:ennorehling/eressea 2020-05-10 18:01:36 +02:00
Enno Rehling 08b9f03afc Fix demon stealth in English reports. 2020-05-10 17:50:56 +02:00
Enno Rehling d059a54ed4
Merge pull request #903 from ennorehling/develop 
bugfix ship + building
 2020-05-09 21:17:36 +02:00
Enno Rehling 6e7a234d7a
Merge pull request #902 from ennorehling/master 
fix for unit that's in both ship and building
 2020-05-09 21:17:26 +02:00
Enno Rehling 8ef2ec71e9 Merge branch 'master' into develop 2020-05-09 21:08:20 +02:00
Enno Rehling caf8f1de9d Merge branch 'master' of github.com:ennorehling/eressea 2020-05-09 21:07:43 +02:00
Enno Rehling 1a63e41929 Bug 2659: units inside building AND ship 2020-05-09 21:06:25 +02:00
Enno Rehling 1c32d1f9f0
Merge pull request #901 from ennorehling/develop 
Develop
 2020-05-03 20:24:55 +02:00
Enno Rehling 46b230cbba Merge branch 'lua53' into develop 2020-05-03 17:06:28 +02:00
Enno Rehling 93cdeae2a8 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-03 17:06:21 +02:00
Enno Rehling c5dae48615 Merge branch 'lua53' of github.com:ennorehling/eressea into lua53 2020-05-03 17:05:17 +02:00
Enno Rehling 4f2a34ae10 make cmake-init executable 2020-05-03 16:59:28 +02:00
Enno Rehling 6cf6f96fb8 Fix test to work with lunitx on Lua 5.1 2020-05-03 16:52:40 +02:00
Enno Rehling 04c3052916 fix allies module 2020-05-03 15:59:37 +02:00
Enno Rehling 649e662331 re-enable missing tests in E2 2020-05-03 15:20:35 +02:00
Enno Rehling 5010b2e8d1 remove duplicate test functions 2020-05-03 15:20:35 +02:00
Enno Rehling 80f5ec9ada make all test modules work with lunitx 2020-05-03 15:20:35 +02:00
Enno Rehling 614209492f use luarocks 2020-05-03 15:20:35 +02:00
Enno Rehling 17e5d6ab78 convert to lua 5.3 2020-05-03 15:20:35 +02:00
Enno Rehling 97cb46933e typo, ccidental bit-shift operation 2020-05-03 15:16:32 +02:00
Enno Rehling 3c533580f7 tolua 5.3 support on macOS 2020-05-03 15:05:22 +02:00
Enno Rehling 62531107ae windows/linux merge 2020-05-02 11:19:49 +02:00
Enno Rehling 78ca97be4b Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-02 11:14:17 +02:00
Enno Rehling 0d5bef5256 re-enable missing tests in E2 2020-05-02 11:13:26 +02:00
Enno Rehling c1412d3050 remove duplicate test functions 2020-05-02 11:05:34 +02:00
Enno Rehling 947a72278e make all test modules work with lunitx 2020-05-02 11:05:34 +02:00
Enno Rehling 34e076f75b use luarocks 2020-05-02 11:04:33 +02:00
Enno Rehling 64a2890c91 convert to lua 5.3 2020-05-02 11:04:33 +02:00
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