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

8106 Commits

Author SHA1 Message Date
Enno Rehling 48bece3257 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-01-30 21:43:39 +01:00
Enno Rehling 2b3617a998 build versioning for pre-release builds 2017-01-30 10:35:59 +01:00
Enno Rehling 3d8d091207 new build scripts, new versioning system 2017-01-30 10:26:08 +01:00
Enno Rehling da6a58aed5 Merge remote-tracking branch 'eressea/master' 2017-01-29 14:20:31 +01:00
Enno Rehling 7cf07e359b Merge remote-tracking branch 'eressea/develop' into develop 2017-01-29 14:20:10 +01:00
Enno Rehling 93be6eb642 Merge branch 'master' into develop 2017-01-29 13:33:30 +01:00
Enno Rehling 15067a39bc Merge pull request #646 from ennorehling/hotfix/3_10_5 
Hotfix Version 3.10.5
 2017-01-29 13:07:36 +01:00
Enno Rehling 6eded43ce9 Merge branch 'master' into hotfix/3_10_5 2017-01-29 13:03:27 +01:00
Enno Rehling f58db3f729 Bug 2276: hacking a band-aid fix for compress.sh 
aka the game.name related mailpocalypse
http://bugs.eressea.de/view.php?id=2276
 2017-01-29 12:59:09 +01:00
Enno Rehling bf22cbc2ef increase MAXTEACHERS again (permament fix in 3.11) 2017-01-29 11:30:22 +01:00
Enno Rehling 36d884143e Bug 2278: Neue Magier können nicht gelehrt werden. 
http://bugs.eressea.de/view.php?id=2278
 2017-01-29 11:06:08 +01:00
Enno Rehling 7437ebb36a WIP: make all spell configuration use spellref. 
does not pass tests.
 2017-01-29 10:45:22 +01:00
Enno Rehling 2016a9ef20 unused function 2017-01-28 20:07:31 +01:00
Enno Rehling 3ac834a46d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-01-28 20:02:22 +01:00
Enno Rehling d794ad4433 Eressea config requires game.id 
At home, I am running all games from the same directory for testing, and cannot use eressea.ini for setting game.id

Override it in eressea.ini for other games.
 2017-01-28 20:02:15 +01:00
Enno Rehling 11c0330de1 make race::attack use spellref, too. 2017-01-28 19:52:28 +01:00
Enno Rehling 6d15767a18 create a spellref structure. 
use this when referring to spells that may not (yet) exist.
use it for race::precombatspell (rare use case).
 2017-01-28 19:42:20 +01:00
Enno Rehling d4e5e5f478 add a simple upgrade script for non-developers. 2017-01-27 20:22:23 +01:00
Enno Rehling 0913336ef8 Use MSVC fixes for clibs compilation. 2017-01-26 21:47:59 +01:00
Enno Rehling 554c6b099a Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-01-26 21:35:12 +01:00
Enno Rehling f941fceed4 new cmake modules (expat) 2017-01-26 21:34:45 +01:00
Enno Rehling 50c5b44664 Merge pull request #643 from ennorehling/develop 
something went wrong
 2017-01-26 19:26:51 +01:00
Enno Rehling 146cb9b00d fix merge conflict 2017-01-26 19:19:40 +01:00
Enno Rehling 5b221eda4e Merge remote-tracking branch 'upstream/develop' into develop 2017-01-26 19:17:42 +01:00
Enno Rehling 085e1e0011 Merge pull request #642 from ennorehling/clibs 
use clibs submodule, and selist instead of quicklist
 2017-01-26 19:15:43 +01:00
Enno Rehling e47957ae8e Merge branch 'develop' into clibs 2017-01-26 19:06:14 +01:00
Enno Rehling 23b211d9e4 fix study.c teacher messaging 2017-01-26 18:58:29 +01:00
Enno Rehling 57f6c56e89 remove quicklist shim, use selist everywhere 2017-01-26 18:07:34 +01:00
Enno Rehling 350357120a fix duplicate cutest library conflict and crash 2017-01-26 18:06:49 +01:00
Enno Rehling e4a58b2e62 hack compress to not use /home/enno/bin script 2017-01-26 18:06:49 +01:00
Enno Rehling 21514f3bfe BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling 2a1ead6506 BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling 044953e4ab add a function to compare size of occupied castles 2017-01-26 18:06:49 +01:00
Enno Rehling dcdb5354d9 BUG 2273: runtests.bat fails when config is auto-loaded. 
run rules tests with the correct configuration, ignore .ini file
setting.
still not enabling auto-load again, use custom.lua instead.
 2017-01-26 18:06:48 +01:00
Enno Rehling c0692986b2 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-26 18:06:48 +01:00
Enno Rehling d8770932f0 fix issue #477 (intermittent volcano) 2017-01-26 18:06:48 +01:00
Enno Rehling a79e5ef2a5 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-26 18:06:48 +01:00
Enno Rehling af1ce9b84e issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-26 18:06:48 +01:00
Enno Rehling 1bd6ab11ea FACTION and PARTEI should both start orders. 2017-01-26 18:06:48 +01:00
Enno Rehling b2e6c48186 specify a game id, because there is one in the data 2017-01-26 18:06:48 +01:00
Enno Rehling 21b617c973 fix game_name, remove it from rules 2017-01-26 18:06:48 +01:00
Enno Rehling ee88c13732 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-26 18:06:48 +01:00
Enno Rehling ef10c60714 the locales module is deprecated. 
let's do this in custom.lua from now on.
 2017-01-26 18:06:48 +01:00
Enno Rehling 963713b189 remove unused equipment sets (from an unrealized feature). 2017-01-26 18:06:48 +01:00
Enno Rehling 98be6bb8ae eliminate duplicate password message 2017-01-26 18:06:48 +01:00
Enno Rehling 76af048fed clean the quipment interface for lua a little bit. 2017-01-26 18:06:48 +01:00
Enno Rehling 64e45248dc rename create_equipment function 2017-01-26 18:06:48 +01:00
Enno Rehling e7a41a2017 missing includE 2017-01-26 18:06:48 +01:00
Enno Rehling f4e25fe20e try loading config.lua and custom.lua files, if they exist. 2017-01-26 18:06:48 +01:00
Enno Rehling abeb7e344e configure dbname in eressea.ini (or don't use DB if not 2017-01-26 18:06:48 +01:00