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

8583 Commits

Author SHA1 Message Date
Enno Rehling 219a3159e8 sort the at_keys array, binary search. 2017-08-20 12:58:05 +02:00
Enno Rehling aac2b0a60f Merge branch 'master' 2017-08-18 21:11:18 +02:00
Enno Rehling e52d4e3419 Merge pull request #722 from ennorehling/master 
BUG 2356: fix broken data files
 2017-08-18 21:09:54 +02:00
Enno Rehling 89d50e9b72 fix compile, wrong data version. 2017-08-18 21:05:26 +02:00
Enno Rehling e2578966e5 fix bad data caused by bug 2356 2017-08-18 21:02:23 +02:00
Enno Rehling dced8618dc Merge remote-tracking branch 'upstream/master' 2017-08-18 20:32:19 +02:00
Enno Rehling 21a43b8be9 Merge remote-tracking branch 'upstream/develop' into develop 2017-08-18 20:31:56 +02:00
Enno Rehling 54b5b09e15 Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
	src/modules/autoseed.c
 2017-08-18 20:31:14 +02:00
Enno Rehling d13cd0d0df Merge pull request #721 from ennorehling/master 
BUG 2357: new players must be able to recruit
 2017-08-18 20:26:23 +02:00
Enno Rehling aa61860996 BUG 2357: make sure starting regions have enough recruits 2017-08-18 20:20:12 +02:00
Enno Rehling b8e755c023 Merge pull request #720 from ennorehling/hotfix/bug-2356-curse-flags 
BUG 2356: Mauern der Ewigkeit
 2017-08-18 19:54:05 +02:00
Enno Rehling 7a4a49160c unused variable 2017-08-18 19:48:34 +02:00
Enno Rehling c8b2ce7900 BUG 2356: fix curse read/write 
rename curse::flags to curse::mask, use c_flags.
fix some curse_type having CURSE_ISNEW fixed.
 2017-08-18 19:39:33 +02:00
Enno Rehling 293cb78de8 BUG 2356: add a failing test. 2017-08-18 19:36:17 +02:00
Enno Rehling 3ea06b23e8 Merge branch 'master' into develop 2017-08-16 21:50:40 +02:00
Enno Rehling b6dc3fd6f4 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:50:26 +02:00
Enno Rehling a8e9da1c19 do not upgrade keys for later data versions 2017-08-16 21:48:04 +02:00
Enno Rehling 7f98fd9f22 Merge pull request #719 from ennorehling/master 
a_key conversion bugs
 2017-08-16 21:38:10 +02:00
Enno Rehling 6d050bb6c2 fix a_key attribute still being written. 
simplify (and slow down) key upgrades.
 2017-08-16 21:33:02 +02:00
Enno Rehling 2ba47a40d1 Merge remote-tracking branch 'upstream/master' 2017-08-16 20:48:39 +02:00
Enno Rehling 9d8e9cc00b at_keys is overflowing, add an assert to detect it 2017-08-16 20:48:03 +02:00
Enno Rehling aec994ec6f Merge pull request #718 from ennorehling/master 
fix bad test
 2017-08-11 18:34:55 +02:00
Enno Rehling 62d8024c49 fix dupe detection 2017-08-09 19:42:55 +02:00
Enno Rehling c984e876af Merge branch 'master' into develop 
Conflicts:
	src/modules/autoseed.c
 2017-08-09 19:42:24 +02:00
Enno Rehling b2a8fc8c75 Merge remote-tracking branch 'upstream/master' 2017-08-09 19:41:20 +02:00
Enno Rehling c4f7e36903 fix valgrind report in a test (bad rtype construction) 2017-08-09 19:39:29 +02:00
Enno Rehling bbeac66250 fix dupe detection 2017-08-09 19:18:45 +02:00
Enno Rehling 5b342f9b11 Merge pull request #717 from ennorehling/master 
gmtools
 2017-08-09 19:08:58 +02:00
Enno Rehling d80b782283 Merge remote-tracking branch 'upstream/master' 2017-08-09 19:08:22 +02:00
Enno Rehling 1aa142d821 log warnings for duplicate new emails. 2017-08-09 19:04:49 +02:00
Enno Rehling c310249904 Merge pull request #716 from ennorehling/master 
gmtool improvements
 2017-08-07 19:07:23 +02:00
Enno Rehling 0cb085378d Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
 2017-08-07 19:01:07 +02:00
Enno Rehling dd096db1d8 Merge remote-tracking branch 'upstream/develop' into develop 2017-08-07 19:00:11 +02:00
Enno Rehling 2aab736b59 try giving new factions a name 2017-08-07 18:58:39 +02:00
Enno Rehling aae1095c00 Merge remote-tracking branch 'upstream/master' 2017-08-07 18:47:05 +02:00
Enno Rehling c387e985b8 gmtool can clear regions 2017-08-07 18:38:10 +02:00
Enno Rehling e59ae05729 Merge branch 'master' of github.com:eressea/server 2017-08-07 18:37:33 +02:00
Enno Rehling 292117f2b1 Merge pull request #715 from ennorehling/develop 
BUG 2353, 2354, 2355
 2017-08-06 21:32:25 +02:00
Enno Rehling 59cee972e3 BUG 2355: (temporarily) disable assert 
https://bugs.eressea.de/view.php?id=2355
 2017-08-06 21:27:20 +02:00
Enno Rehling 40581e9a04 Merge remote-tracking branch 'upstream/develop' into develop 2017-08-06 21:05:54 +02:00
Enno Rehling faf0f48a70 BUG 2354: fix email validation. 
https://bugs.eressea.de/view.php?id=2354
 2017-08-06 21:03:51 +02:00
Enno Rehling 78f8ec0173 Added a test for the set_email function. 
I'm hoping to trigger bug 2354 in a unit test.
 2017-08-06 19:02:57 +02:00
Enno Rehling 9110d01229 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-08-06 18:55:19 +02:00
Enno Rehling 4291c4de3d BUG 2353: Segen der Erde produziert zu viel Silber 
https://bugs.eressea.de/view.php?id=2353
In E3 gibt es legazy-attribute mit falschem Effekt, ignorieren.
 2017-08-06 18:52:59 +02:00
Enno Rehling 97ad61023e Merge pull request #714 from stm2/bug2350 2017-08-05 09:27:34 +02:00
Steffen Mecke f0c17b01af fixed demon_skillchange and produceexp 
learn_skill's argument is the number of person days, not the number of unit days as assumed!
 2017-08-04 15:23:05 +02:00
Steffen Mecke 80bfb5dbc6 rename teacher variable 2017-08-01 22:09:57 +02:00
Steffen Mecke 160ef71d40 refactor for STUDYDAYS 2017-08-01 22:09:57 +02:00
Steffen Mecke 1edfb7ae8e use STUDYDAYS consequently 2017-08-01 22:09:57 +02:00
Steffen Mecke 4fe72b5d28 BUG 2350: read studyspeed correctly and fix orcs 2017-08-01 22:09:57 +02:00