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

5480 Commits

Author SHA1 Message Date
Enno Rehling 57bb4a49f1 fix git submodule urls (badgerman->ennorehling) and iniparser 2015-08-04 10:25:57 +02:00
Enno Rehling 4649a0861d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/buildno.h
 2015-08-03 19:49:50 +02:00
Enno Rehling 6727b0cbe4 Merge pull request #261 from ennorehling/hotfix/bug-2123-gbdream-no-mage 
Hotfix 3.5.4 (against master)
 2015-08-02 23:22:28 +02:00
Enno Rehling 9938b3fb66 eliminate update_gbdream completely, make code smaller and simpler. 
simplify tests (no need to use create_spell if we don't use it)
increase build no for hotfix.
 2015-08-02 23:16:41 +02:00
Enno Rehling d99ffaf1ed filter by curse-type before trying to call update_gbdreams. 2015-08-02 22:45:59 +02:00
Enno Rehling b5ed7c562d wait until curse->magician has been resolve()'s before calling effskill() to find f->max_spelllevel. 2015-08-02 22:08:35 +02:00
Enno Rehling 17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling a119f7617f add some assertions to make sure update_gbdream is not called without a magician 2015-08-02 21:17:21 +02:00
Enno Rehling 65b7fc7ff8 prefer clang 2015-07-12 04:49:40 +02:00
Enno Rehling 12d7862c51 Merge branch 'hotfix-3-5-3' 2015-07-12 04:48:35 +02:00
Enno Rehling d9008d0525 Merge branch 'hotfix-3-5-3' of github.com:eressea/server into hotfix-3-5-3 2015-07-11 14:35:51 +02:00
Enno Rehling 2630b6203d updte submoduiles before building 2015-07-11 14:33:56 +02:00
Enno Rehling 77b1bd6ef3 updte submoduiles before building 2015-07-11 14:33:09 +02:00
Enno Rehling 57268d3cd2 remove old iniparser 2015-07-11 12:55:13 +02:00
Enno Rehling 730996bedf send signals from travis to slack 2015-07-07 15:32:24 +02:00
Enno Rehling 5175c209f8 Merge pull request #252 from badgerman/hotfix-3-5-3 
add a holy ground curse to all new starting regions.
 2015-07-05 18:53:28 +02:00
Enno Rehling c1ba6a99e3 add a holy ground curse to all new starting regions. 2015-07-05 18:45:15 +02:00
Enno Rehling c37974eaf4 Merge pull request #251 from badgerman/hotfix-3-5-3 
return to old mechanism of equipping the first unit, and give some ba…
 2015-07-05 17:49:08 +02:00
Enno Rehling 7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling 6672251b2d fewer units for new players, two players per region 2015-07-05 16:03:04 +02:00
Enno Rehling 4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +02:00
Enno Rehling 3074a6077d avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-05 15:24:06 +02:00
Enno Rehling 9185b2af28 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 15:23:54 +02:00
Enno Rehling a28ca695fd start new hotfix branch 2015-07-05 15:19:38 +02:00
Enno Rehling 85230f7d11 pull latest version before building develop 2015-06-28 13:38:38 +02:00
Enno Rehling 5b2538b72d increase build number 2015-06-21 18:32:57 +02:00
Enno Rehling ecb2b9b3b3 Merge pull request #234 from badgerman/hotfix/issue-233-invalid-read 
invalid read, dead factions must leave their alliance
 2015-06-21 18:29:00 +02:00
Enno Rehling a085442b8f eliminate unused variable. 2015-06-21 17:54:39 +02:00
Enno Rehling 04bf7153f0 remove a faction from its alliance when it is dead. 2015-06-21 17:49:22 +02:00
Enno Rehling 872721dc0f Merge branch 'master' of github.com:eressea/server 2015-06-08 09:46:55 +02:00
Enno Rehling 4a31bea3b9 increase build number, new version installed 2015-06-08 09:46:07 +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 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 9695b49f40 fix floating point inconsistency on 32-bit x86 CPUs 2015-05-24 13:12:23 +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 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