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

10598 Commits

Author SHA1 Message Date
Enno Rehling 6a9cea219c https://bugs.eressea.de/view.php?id=2692 inherit racial stealth from creator unit 2020-08-16 16:00:08 +02:00
Enno Rehling f1a0a7a55c https://bugs.eressea.de/view.php?id=2693 
STIRB + PARTEI transferiert auch Magier des gleichen Gebietes.
 2020-08-16 12:44:03 +02:00
Enno Rehling afa160c4c3 fix crash in turn 1181 2020-08-15 23:29:40 +02:00
Enno Rehling 78b9149636
Merge pull request #920 from eressea/bug-2686 
Bug 2686
 2020-08-03 11:22:32 +02:00
Enno Rehling eed0473421 remove the stealthany race flag 2020-08-03 10:33:24 +02:00
Enno Rehling 3b864b10fc bug 2686: stealth races not translated correctly. 2020-08-03 10:31:58 +02:00
Enno Rehling f39873fc59 Merge branch 'master' of github.com:eressea/server 2020-07-26 12:58:25 +02:00
Enno Rehling c3284bdf2b fix create-orders script so it works with full pathnames 2020-06-27 21:42:33 +02:00
Enno Rehling bd407c5401 Merge branch 'master' of github.com:eressea/server 2020-06-26 22:51:57 +02:00
Enno Rehling de40103a2e export orders using php tools 2020-06-26 21:58:30 +02:00
Enno Rehling 14f4750411 new dependency, quick hack for uploaded orders 2020-06-26 19:09:32 +02:00
Enno Rehling 0dc4027984 Merge branch 'develop' 2020-06-05 03:59:32 +02:00
Enno Rehling 31a2495a45
Merge pull request #908 from ennorehling/develop 
Develop
 2020-05-24 16:44:15 +02:00
Enno Rehling 085115c4e4 Merge branch 'master' into develop 2020-05-24 16:14:38 +02:00
Enno Rehling fe35ca0604 reduce cron messages 2020-05-24 16:12:40 +02:00
Enno Rehling 721b160cb5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-24 16:12:22 +02:00
Enno Rehling 5cf5e2751a
Merge pull request #907 from ennorehling/master 
bug 2666 english creport is broken
 2020-05-24 15:58:29 +02:00
Enno Rehling 3a76261302 bug 2666 english creport is broken 2020-05-24 15:41:19 +02:00
Enno Rehling 43397ca792
Merge pull request #906 from ennorehling/develop 
Develop
 2020-05-23 12:37:37 +02:00
Enno Rehling 405f8f240a No! Static variables are BAD! 2020-05-23 11:21:16 +02:00
Enno Rehling 386dd07623 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-05-23 11:11:07 +02:00
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