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

5358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
1c19a6948c kill some dead code. 2014-10-15 18:19:16 +02:00
Enno Rehling
352d947770 debugging done, no need to be so verbose 2014-10-14 23:25:54 +02:00
Enno Rehling
9742ee265f fix eressea.ini for travis, again 2014-10-14 23:22:02 +02:00
Enno Rehling
e1b1f9e03f fix eressea.ini for travis 2014-10-14 23:18:01 +02:00
Enno Rehling
c30a9bd524 travis debugging 2014-10-14 23:10:00 +02:00
Enno Rehling
9ce996051d Merge branch 'master' of github.com:badgerman/eressea 2014-10-14 23:02:56 +02:00
Enno Rehling
403c1ad6a9 fix errors and warnings that clang reports. 2014-10-14 22:57:02 +02:00
Enno Rehling
cf71d667c2 fix travis build 2014-10-14 22:44:36 +02:00
Enno Rehling
2b2fb2ed3e Travis: install build prerequisites 2014-10-14 22:30:17 +02:00
Enno Rehling
a18ea927e6 Travis CI integration 2014-10-14 22:19:36 +02:00
Enno Rehling
76b2325c19 eliminate unused variable warning. 2014-10-14 20:56:58 +02:00
Enno Rehling
7987b82c62 remove obsolete scripts and module definitions. 
a lot of these were from before the module rewrite, and duplicates of the new code.
 2014-10-14 18:55:44 +02:00
Enno Rehling
ce3e9cd7d0 Add missing test coverage for update_guards. Fix the weapon:minskill default. 2014-10-14 18:37:45 +02:00
Enno Rehling
815cf3edbc Merge branch 'master' of github.com:badgerman/eressea 2014-10-12 21:27:33 +02:00
Enno Rehling
bac3286440 re-implement faction:add_message for Lua. 
only ancient xmas scripts were using it, but it's a useful function to have.
 2014-10-12 21:26:25 +02:00
Enno Rehling
61a1b6fafd useful scripts for setting up the game. 
fix silver->money in the build scripts.
config.lua: load the game configuration
reports.lua: write the reports for the (initial) turn
 2014-10-10 20:19:04 +02:00
Enno Rehling
fb32ebcd18 segmentation fault in export when a plane has no name (default plane). 2014-10-09 08:34:03 +02:00
Enno Rehling
077d7d8d49 cmp_taxes ruft regionowner() auf, und das hat ein assert, welches 
testet das die Regel für Regionsbesitz aktiv ist. E2 hat aber keine
Regionsbesitzer. Ergo kann in E2 auch der Regionebesitzer nicht für
Leuchttürme zahlen, der Eintrag aus config.xml muss da wieder raus.
 2014-10-06 07:17:46 +02:00
Enno Rehling
49128bdc79 syntax error in configuration files 2014-10-05 19:31:47 +02:00
Enno Rehling
595dc1334e fix new harbor code, add tests. 
- alliances were checked in the opposite direction
- code crashed when harbor has no owner
 2014-10-03 21:26:11 +02:00
Enno Rehling
98b69dc614 Merge branch 'master' of github.com:eressea/server 2014-10-03 19:27:38 +02:00
Enno Rehling
60cc3cc3d3 Merge pull request #37 from CTD1/Hafen2 
Häfen nur anlaufen mit Helfe Bewache
 2014-10-03 19:27:08 +02:00
CTD
6f10ee828c Merge branch 'Hafen_und_Helfe_bewache' into Hafen2 2014-10-02 18:09:52 +02:00
Enno Rehling
a78daad4d8 Merge pull request #34 from CTD1/Hunger 
Hunger und Segeltalent
 2014-10-01 13:48:51 +02:00
Enno Rehling
232b935e0f Merge pull request #31 from CTD1/XML_config_changes 
Xml config changes
 2014-10-01 13:47:23 +02:00
Enno Rehling
d0d1ef5af0 Merge branch 'master' of github.com:eressea/server 2014-09-30 17:51:35 +02:00
Enno Rehling
6c2429cccb Version 3.3 released, build 685 2014-09-30 17:50:29 +02:00
Enno Rehling
4527ffdda2 refactoring and tests for wormhole module. 2014-09-29 23:19:59 +02:00
Enno Rehling
139ff04108 fix compilation warning on gcc. 2014-09-29 21:22:44 +02:00
Enno Rehling
68730749fb fix astral space special direction, vortex (translation issue). 2014-09-29 21:19:07 +02:00
Enno Rehling
cbf9bb8985 fix qsort in wormhole code. pointers are hard. 2014-09-29 20:38:01 +02:00
Enno Rehling
3e829e2880 support for itoab with smaller bases and larger numbers. 
also a missing English message (museum-related)
 2014-09-29 18:32:12 +02:00
CTD
c937f59536 XML Option hinzugefügt 
Das Segeln nur 1 Skill Level verliert ist Default und somit an.
 2014-09-25 09:54:52 +02:00
CTD1
911b93e343 Update faction.c 2014-09-25 08:59:29 +02:00
Enno Rehling
8432a6369d guess the ERESSEA environment if it is missing 2014-09-21 16:55:28 +02:00
Enno Rehling
b4f6e3c21d fix remaining getstrtoken uses without null-check. 
Conflicts:
	src/economy.c
	src/items.c
	src/kernel/config.c
	src/laws.c
 2014-09-21 16:51:05 +02:00
Enno Rehling
74582aeb2f fix remaining getstrtoken uses without null-check. 2014-09-21 16:43:17 +02:00
Enno Rehling
c5be92a7fc fix preview scripts to auto-checkout master 2014-09-21 10:03:48 +02:00
Enno Rehling
a5961d069c Merge branch 'master' of github.com:eressea/server 2014-09-21 10:00:02 +02:00
Enno Rehling
da42feae58 do not need bash 2014-09-21 09:59:48 +02:00
Enno Rehling
f6e976296e change to the right directory before running previews. 2014-09-21 09:56:15 +02:00
Enno Rehling
8b19d51c65 Merge branch 'master' of github.com:eressea/server 2014-09-19 19:57:48 +02:00
Enno Rehling
7f0fdd1eb5 added a test for a purely hypopthetical problem (issue 2032) in keyword parsing. 2014-09-19 19:49:44 +02:00
CTD
3484acfa43 Arbeitsplätze 
Regionen haben jetzt immer mindestens 10% ihrer size als freie Freie
Arbeitsplätzt, höchstens jedoch 200.  Das sorgt dafür das die Bäume
nicht alle Bauern umbringen. Diese ernähren sich quasi durch Jagt statt
Ackerbau.
Sinnlose Variable MAXPEASANTS_PER_AREA entfernt.
 2014-09-18 12:10:42 +02:00
CTD
f89721ebec Monster Email 
kann jetzt über die config.xml eingestellt werden
 2014-09-16 09:21:33 +02:00
CTD
9e5e7a3e52 Hunger und Segeltalent 
Hungernde Einheiten verlieren nur noch einen Punkt Segeln (ab T2), nicht
mehr das halbe Talent.
Das sollte die meisten Schiffsunfälle durch vergessene Silber derart
abschwächen, das die Schiffe noch aus eigener Kraft zum nächsten Hafen
kommen.
 2014-09-15 16:10:57 +02:00
Enno Rehling
d9e53573b5 Merge pull request #33 from CTD1/Monster 
Drachen-Attacken in E3 abstellen.
 2014-09-06 18:09:42 +02:00
Enno Rehling
baffbbf154 Merge branch 'master' of github.com:eressea/server 2014-09-04 21:20:15 +02:00
Enno Rehling
b761cb5b97 Merge branch 'master' of https://github.com/eressea/server 2014-09-04 17:22:33 +02:00
Enno Rehling
54cf4f4b7b Merge branch 'version-3-2' 
Conflicts:
	src/laws.c
 2014-09-02 09:26:59 +02:00