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

4820 Commits

Author SHA1 Message Date
Enno Rehling 539d2673f7 fix a crash in E2 caused by the recent removal of FFL_TIMEOUT. 2014-10-18 19:19:21 +02:00
Enno Rehling 5626abd8dc refactor and kill dead code. 
indentation normalization, copyright update.
 2014-10-18 18:37:44 +02:00
Enno Rehling a58afb9d15 added test for removal of atributes. 
refactor existing tests a bit, free up memory.
 2014-10-18 17:51:07 +02:00
Enno Rehling b37e8ac138 add a test for attrib->nexttype. 
fix gcc build.
 2014-10-18 17:12:43 +02:00
Enno Rehling 8f57adaf5b declare types (gcc failure). 2014-10-18 14:30:07 +02:00
Enno Rehling 74a6bd72c2 additional testing. 2014-10-18 14:16:26 +02:00
Enno Rehling a86c2d88ab Test: After a faction is eliminated, nobody should have it as an ally. 2014-10-17 19:56:26 +02:00
Enno Rehling 27ddeb7adc Merge branch 'master' of github.com:eressea/server 2014-10-16 14:33:43 +02:00
Enno Rehling cd470d5e27 fix string concatenation operator 2014-10-16 14:33:20 +02:00
Enno Rehling c6b6883477 Merge pull request #36 from CTD1/Workingplace 
Arbeitsplätze

It's weird. It worked on this PR, probably because it is based on a revision of master where the .travis.yml file already exists. For older PRs that were created before that file was in master, it doesn't work. We don't have many open ones, so it's not actually worth investigating how to fix that :-)
 2014-10-16 14:05:49 +02:00
Enno Rehling 9c6e380ea0 Merge pull request #35 from CTD1/Monster_EMail 
Wird schon richtig sein :-)
 2014-10-16 11:53:45 +02:00
Enno Rehling 34c80713ad Merge pull request #39 from badgerman/master 
Additional tests and elimination of dead code
 2014-10-16 10:25:39 +02:00
Enno Rehling ac65d83ba2 test that empty factions are removed, but not monsters. 2014-10-16 09:03:57 +02:00
Enno Rehling 440aca34ea test special treatment for spells in remove_empty_units. 2014-10-16 08:06:44 +02:00
Enno Rehling 559f1f905a Eliminate dead code: FFL_NOTIMEOUT. 
old feature for time-limited factions, not used anywhere.
 2014-10-16 07:46:08 +02:00
Enno Rehling 7df47fd25c remove bad configuration caching (TODO: cache inside get_param). 
move remove_empty_* functions out of config.c
add basic tests for remove_empty_units (no special units yet).
 2014-10-16 07:41:49 +02:00
Enno Rehling 1d20e35292 Merge pull request #38 from badgerman/master 
Testing pull request builds with Travis
 2014-10-15 20:12:43 +02:00
Enno Rehling 8d6a25d15a Merge branch 'master' of github.com:badgerman/eressea 2014-10-15 19:37:41 +02:00
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