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

6658 Commits

Author SHA1 Message Date
Enno Rehling fadc92ee52 do not leak memory for factions that have died. 2016-01-11 18:17:24 +01:00
Enno Rehling 20063e0e0e fix errors in the order of cleanup 2016-01-11 18:03:53 +01:00
Enno Rehling 04e2fb73c7 fix test of allies status after destroying a faction 2016-01-11 15:08:36 +01:00
Enno Rehling 50eba2d308 I don't really believe that this is going to work, but let's see where it fails. 2016-01-11 14:59:25 +01:00
Enno Rehling 04624179ce make destroyfaction not have to loop over all factions to clear HELP status. 2016-01-11 14:42:36 +01:00
Enno Rehling 8742317979 hack: do not free faction when we destroy it (issue #451) 2016-01-11 14:01:55 +01:00
Enno Rehling 05c53735c6 Merge pull request #453 from eressea/issue-451-destroyfaction 
Issue 451 destroyfaction
 2016-01-11 13:46:53 +01:00
Enno Rehling 43801f8951 Merge pull request #452 from ennorehling/issue-451-destroyfaction 
smarter handling of faction.alive
 2016-01-11 12:44:53 +01:00
Enno Rehling ca500a499e adding a much-needed getter function for faction_alive 2016-01-11 12:25:23 +01:00
Enno Rehling b4389c91fe fix compilation (what was I thinking?), remove uses of f.alive where they should not be needed. 2016-01-11 11:54:45 +01:00
Enno Rehling de512be1ba make destroyfaction remove the faction from the list (slightly scary change) 2016-01-11 09:55:47 +01:00
Enno Rehling 7d426dc3ed call destroyfaction instead of free as a quick fix 2016-01-10 12:07:00 +01:00
Enno Rehling 4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +01:00
Enno Rehling b8a474db27 release version 3.7.8 2016-01-01 16:37:56 +01:00
Enno Rehling c5c0a590a2 Merge branch 'master' of github.com:eressea/server 2016-01-01 16:37:31 +01:00
Enno Rehling 4907073208 Merge pull request #450 from ennorehling/xmas_messages 
Error messages and tests for snowglobe (master)
 2016-01-01 16:37:06 +01:00
Enno Rehling 25966b3d7f add tests for snowglobe error messages 2016-01-01 16:30:09 +01:00
Enno Rehling 2c7790af9c Merge pull request #445 from stm2/dragon_move 
make dragon movement more deterministic
 2015-12-31 21:16:56 +01:00
Enno Rehling 4fca656df3 Merge pull request #448 from stm2/config_tweak 
fixing booleans in config
 2015-12-31 21:16:20 +01:00
Enno Rehling 4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Enno Rehling e7c23b15db add missing files 2015-12-30 21:22:28 +01:00
Enno Rehling e1f3b3cdcf passing order object into lua use-functions, so we can use them in error messages. 2015-12-30 21:20:59 +01:00
Steffen Mecke bd5d3376d5 fixing booleans in config 
see cf08cdf3fb
 2015-12-30 14:05:42 +01:00
Steffen Mecke 1aca1c6a87 fix logic bug 2015-12-30 14:04:10 +01:00
Enno Rehling 14afee6093 Merge pull request #447 from TurnerSE/feature/xmas2015 
Feature/xmas2015 iteminfo
 2015-12-30 11:25:20 +01:00
Philipp Dreher 18f2cc1d70 cosmetic changes to iteminfo of skillpotion 2015-12-29 09:43:30 +01:00
Philipp Dreher 7b2aa821d0 Added iteminfo for snowglobe in DE+EN 2015-12-29 09:42:54 +01:00
Enno Rehling 2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling 1dc69bb1e8 release version 3.7.7 2015-12-26 14:40:47 +01:00
Enno Rehling e574919555 Merge branch 'master' of github.com:eressea/server 2015-12-26 14:40:21 +01:00
Enno Rehling 899738a93c Merge pull request #446 from ennorehling/xmas 
xmas item 2015
 2015-12-26 11:49:37 +01:00
Enno Rehling d9588fb7fb no snowglobe in E3 
include xmas tests in tests/e2, not in run-tests files
 2015-12-26 11:20:37 +01:00
Enno Rehling 92636cfcd9 put the new(ish) email subject line in the CR, 
as reported in https://bugs.eressea.de/view.php?id=2016
 2015-12-26 11:05:03 +01:00
Enno Rehling b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling e678c1bcce disable snowglobe test, because we are not ready yet 2015-12-22 18:49:11 +01:00
Enno Rehling cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling 80e0707cb2 snowglobe transformations for several trerrains. messages still TBD 2015-12-22 18:46:45 +01:00
Enno Rehling 3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling 81888132e4 add a lua binding to convert user-language strings to directions 2015-12-22 18:45:27 +01:00
Enno Rehling 55c15c1905 add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
Enno Rehling 1f080e2058 release version 3.7.6 2015-12-20 20:17:10 +01:00
Enno Rehling 274322c5b2 fix desert.road in E3 also for 3.7.x 2015-12-20 20:16:13 +01:00
Enno Rehling c9d74ee6ca Merge branch 'master' of github.com:eressea/server 2015-12-20 20:13:15 +01:00
Enno Rehling 9712fcfdc8 Merge pull request #444 from ennorehling/develop 
suppress misc warnings in the log file
 2015-12-18 15:16:51 +01:00
Enno Rehling 810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling 35e2e438e1 Merge pull request #443 from ennorehling/develop 
fix terrain in detectocean message
 2015-12-17 20:50:24 +01:00
Enno Rehling acab4b3199 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2015-12-17 20:36:39 +01:00
Enno Rehling 30acc38d53 https://bugs.eressea.de/view.php?id=2174 
fix terrain type in detectocean message.
 2015-12-17 20:36:21 +01:00
Enno Rehling a05ecb588d Merge pull request #442 from ennorehling/develop 
eliminate duplicate description
 2015-12-17 20:25:19 +01:00
Enno Rehling b700cb5a2c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-12-17 20:21:01 +01:00