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

5904 Commits

Author SHA1 Message Date
Enno Rehling 563a08de97 Merge branch 'develop' of github.com:eressea/server into develop 2015-06-08 09:44:04 +02:00
Enno Rehling 7a881885c3 Merge branch 'badgerman-hotfix/bug-2109-give-unit' into develop 2015-06-08 09:43:46 +02:00
Enno Rehling 266b019928 Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit 
Conflicts:
	scripts/eressea/xmlconf.lua
 2015-06-08 09:43:36 +02:00
Enno Rehling 5fb8748132 Merge pull request #220 from badgerman/hotfix/bug-2109-give-unit 
bug 2109 (GIVE UNIT limits)
 2015-06-08 09:41:10 +02:00
Enno Rehling 12946615e5 Bugfix 2109: Einheiten lassen sich nicht mehr zwischen Parteien übergeben 
https://bugs.eressea.de/view.php?id=2109
Wenn max_transfers < 0 war, wurde das nur in give_men richtig interpretiert, aber nicht in give_unit.
 2015-06-08 09:06:20 +02:00
Enno Rehling 0dd02dbf72 add a test for give_unit between two allied factions. 2015-06-08 08:57:05 +02:00
Enno Rehling 59ddbf9f11 fix broken merge conflict 2015-06-08 08:52:24 +02:00
Enno Rehling bafc7f8237 Merge branch 'release-3-5' 2015-06-08 08:50:51 +02:00
Enno Rehling 29753985f7 Merge branch 'master' into release-3-5 
Conflicts:
	src/laws.test.c
 2015-06-08 08:50:18 +02:00
Enno Rehling 5cf02e35e1 Merge branch 'release-3-5' of github.com:eressea/server into release-3-5 2015-06-08 08:49:14 +02:00
Enno Rehling 6e9f889e77 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/laws.test.c
 2015-06-08 08:47:36 +02:00
Enno Rehling 91a945929e Merge branch 'release-3-5' 2015-06-08 08:46:07 +02:00
Enno Rehling 32b5d7c3d3 Merge branch 'master' into release-3-5 
Conflicts:
	scripts/tests/e3/rules.lua
	src/buildno.h
	src/kernel/version.h
 2015-06-08 08:45:48 +02:00
Enno Rehling e507fc948a Merge pull request #218 from badgerman/develop 
Fix the 'B' island generation to use the newfactions file
 2015-06-02 17:20:33 +02:00
Enno Rehling 0de5d698de Fix the 'B' island generation to use the newfactions file, for use by new GMs. 
configurable island size.
 2015-06-02 15:29:21 +02:00
Enno Rehling c90496e60b Merge pull request #217 from badgerman/develop 
enable clang warning for tautological comparisons
 2015-06-02 00:27:04 +02:00
Enno Rehling 70967fc041 Merge pull request #216 from badgerman/feature/issue-198 
issue #198: gmtool makes invalid demand
 2015-06-01 23:39:41 +02:00
Enno Rehling 6895195659 gmtool makes invalid regions (github issue #198). 
forgot to null a pointer after freeing it.
 2015-06-01 19:56:53 +02:00
Enno Rehling 80deef30b0 additional clang warning for tautological comparisons. 
added to catch a /Wall VS warning in Travis builds.
 2015-06-01 08:04:46 +02:00
Enno Rehling 88be8f670d Merge pull request #215 from badgerman/stm2-cursefix2 
testing curses with memstream
 2015-05-31 11:30:44 +02:00
Enno Rehling 13a358005f fix memstream-based tests, new storage submodule. 2015-05-31 11:03:44 +02:00
Enno Rehling 69821b2a32 cleanup battle.h header 
removed some unreferenced functions from battle.h, made them static in battle.c
 2015-05-30 17:29:01 +02:00
Enno Rehling 0497cbbdde Merge remote-tracking branch 'upstream/develop' into develop 2015-05-27 22:44:55 +02:00
Enno Rehling 618902f723 eliminate Visual C++ warning about pointless range check 2015-05-27 22:44:12 +02:00
Enno Rehling e954b210d4 Merge remote-tracking branch 'upstream/develop' into develop 2015-05-24 16:25:10 +02:00
Enno Rehling b8de887399 change log level from warn->info 2015-05-24 16:21:12 +02:00
Enno Rehling 202d52e7f3 Merge pull request #214 from eressea/release-3-5 
merge changes from release branch back into develop
 2015-05-24 14:11:07 +02:00
Enno Rehling 59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling 24fc66ad1e update build no, re-enable test 2015-05-24 14:05:03 +02:00
Enno Rehling a5f056b4b6 re-enable an assertion that was commented out. 
fix a size_t range warning, change error code for wrptr().
 2015-05-24 14:01:37 +02:00
Enno Rehling 4971795be1 Merge pull request #211 from badgerman/master 
test_peasant_luck_effect failure on x86
 2015-05-24 13:49:57 +02:00
Enno Rehling 820974869b Merge pull request #212 from badgerman/release-3-5 
fix test_peasant_luck_effect failure on x86
 2015-05-24 13:49:51 +02:00
Enno Rehling 06a908a702 Merge pull request #213 from badgerman/develop 
fix test_peasant_luck_effect failure on x86
 2015-05-24 13:49:45 +02:00
Enno Rehling 9695b49f40 fix floating point inconsistency on 32-bit x86 CPUs 2015-05-24 13:12:23 +02:00
Enno Rehling 0c3e310e39 working around floating point inconsistencies on 32 bit x86s 2015-05-24 13:06:20 +02:00
Enno Rehling 1371985776 working around a possible bug in gcc 4.9.2-10ubuntu13 2015-05-24 12:20:24 +02:00
Enno Rehling 6260a45be5 running the test 1000 times should not change the result. 
if it does, that is because it depends on state (of the random number generator), which is bad and needs to be fixed if it makes the test intermittent.
 2015-05-24 11:32:16 +02:00
Enno Rehling 8674fc18c7 ignore gdb_history file 2015-05-24 11:28:58 +02:00
Enno Rehling 4b721e074d diable test_peasantluck, it fails on master 
do not load any config for run-tests.lua
 2015-05-24 10:31:11 +02:00
Enno Rehling 4aceb204ea Merge pull request #210 from badgerman/develop 
fix pool test (GiveRestriction broke it).
 2015-05-24 09:48:06 +02:00
Enno Rehling e9992db51c fix pool test (GiveRestriction broke it). 
- do not default to loading the E2 rules for tests, so GiveRestriction
will not be set to a default value.
- only load configuration if a ruleset has been defined.
 2015-05-24 09:09:34 +02:00
Enno Rehling fb39835cf0 Merge pull request #209 from badgerman/release-3-5 
Release 3.5.1
 2015-05-24 08:00:57 +02:00
Enno Rehling 9780ec845f still having problems with GiveRestriction 2015-05-24 07:49:01 +02:00
Enno Rehling 34b1ead0ac Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-24 07:44:02 +02:00
Enno Rehling 6f50027088 use_item can return positive values now 2015-05-24 07:43:11 +02:00
Enno Rehling e99db198eb bugfix use_item (use_skillpotion did not use pool). 
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
 2015-05-24 07:17:23 +02:00
Enno Rehling 2ddabc1477 Merge branch 'cursefix2' of https://github.com/stm2/server into stm2-cursefix2 2015-05-22 17:27:51 +02:00
Enno Rehling 3e93ebfcb7 Merge pull request #206 from badgerman/feature-giverestriction-default 
Make GiveRestriction default to 0, do not cache
 2015-05-22 17:25:15 +02:00
Enno Rehling 73fa9a276d Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-22 16:23:18 +02:00
Enno Rehling 1a8c95dc61 Merge pull request #205 from badgerman/bug-2103-missing-translation 
Bug 2103: Fehlende Zauberbeschreibung im englischen CR
 2015-05-22 15:45:00 +02:00