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

7974 Commits

Author SHA1 Message Date
Enno Rehling 1a2e3723c7 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-02 20:29:19 +01:00
Enno Rehling 1b78e48511 Merge pull request #648 from ennorehling/develop 
new versioning scheme
 2017-02-02 20:28:11 +01:00
Enno Rehling 3b46004828 Merge branch 'develop' into develop 2017-02-02 20:27:47 +01:00
Enno Rehling d81cb0f9a0 Merge pull request #649 from ennorehling/spellref 
allow forward references to spells in configuration data.
 2017-02-02 20:25:56 +01:00
Enno Rehling 927eb1b8c1 Merge branch 'spellref' of https://github.com/ennorehling/eressea.git 2017-02-02 20:18:40 +01:00
Enno Rehling 7009f26ee5 code duplication, lazy_spell was almost the same as spellref. 2017-02-02 20:18:20 +01:00
Enno Rehling 0224620ca3 code duplication, lazy_spell was almost the same as spellref. 2017-02-02 20:12:52 +01:00
Enno Rehling 456d1bd196 spellbooks should not use spellref, it's unnecessary. 2017-02-02 20:08:04 +01:00
Enno Rehling 9f3f1bf41d fix runtests.bat experience (doh!) 2017-02-02 19:30:29 +01:00
Enno Rehling e9a5a79c65 make my visual studio debugging experience the same as before (-r is like -c) 2017-02-02 19:28:46 +01:00
Enno Rehling 784a934c47 Fix snotling XML (no recruiting). 2017-02-02 19:17:01 +01:00
Enno Rehling 0c08a64495 new clibs module, fixed MSVC settings 2017-02-02 17:10:53 +01:00
Enno Rehling 4c8a327a15 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-02 16:57:30 +01:00
Enno Rehling b08b1544f4 snotling is not a player race 2017-02-02 16:55:07 +01:00
Enno Rehling 7e69149c40 WIP: spellref everywhere 2017-02-02 16:52:32 +01:00
Enno Rehling abed38db0c uninitialized variable. 2017-02-02 10:19:39 +01:00
Enno Rehling ae83448e4a Deveron is now just E3 with a different name. 
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
 2017-02-02 10:10:21 +01:00
Enno Rehling 534e5874e9 Merge branch 'gmtool' into develop 
Conflicts:
	src/util/unicode.test.c
 2017-01-31 22:19:00 +01:00
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