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

8769 Commits

Author SHA1 Message Date
Enno Rehling 55655e6d33 Merge branch 'master' into develop 2017-09-03 11:13:28 +02:00
Enno Rehling 3c86880b2e add the report email text to the install process 2017-09-03 11:09:15 +02:00
Enno Rehling 437deccddd Merge remote-tracking branch 'upstream/develop' into develop 2017-09-02 22:12:26 +02:00
Enno Rehling 4ac80d3e5b Merge pull request #726 from ennorehling/develop 
clone_men and familiars
 2017-09-02 22:12:03 +02:00
Enno Rehling 30b0b2ad81 fix a lot of memory leaks that were exposed by unit tests. 2017-09-02 17:36:09 +02:00
Enno Rehling 71ced993e2 Merge remote-tracking branch 'upstream/develop' into develop 2017-09-02 17:10:55 +02:00
Enno Rehling 754354226d Merge pull request #727 from stm2/bug2355 
simplify academy teaching code, addressing bug 2335
 2017-09-02 17:10:15 +02:00
Steffen Mecke 080d5e3f65 rename teaching_info.value to days 2017-09-02 15:50:03 +02:00
Steffen Mecke b98c01a7b8 simplify academy teaching code, addressing bug 2335 2017-09-02 03:24:04 +02:00
Enno Rehling 5f518ae4f0 Merge pull request #725 from ennorehling/develop 
Bugfixes for 3.14 release
 2017-09-01 22:23:48 +02:00
Enno Rehling 108268fa17 BUG 2269: Vertraute vergessen ihre Magie nicht. 2017-09-01 22:10:38 +02:00
Enno Rehling eabf72e60e BUG 2362: clone_men hitpoint calculation was wrong. 2017-09-01 22:04:36 +02:00
Enno Rehling a8bfa5e095 try fixing familars without a mage. 2017-08-31 21:19:25 +02:00
Enno Rehling 0b6f5aa064 handle eressea.ini containing a 0 to disable modules 2017-08-28 00:04:05 +02:00
Enno Rehling 1ac64650b0 BUG 2360: upper limits for trees. 
https://bugs.eressea.de/view.php?id=2360
 2017-08-27 20:10:27 +02:00
Enno Rehling 8517857d55 BUG 2361: familiars cannot forget magic. 
https://bugs.eressea.de/view.php?id=2361
 2017-08-27 19:55:04 +02:00
Enno Rehling aa27c91a6e BUG 2289: Beschreibung "Opfere Kraft" 2017-08-27 17:11:07 +02:00
Enno Rehling 13059df707 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-08-25 21:11:27 +02:00
Enno Rehling f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +02:00
Enno Rehling 612cd1158a move chaosgate to borders.c 2017-08-25 21:07:23 +02:00
Enno Rehling faefaf2523 deprecate unused at_cursewall. 2017-08-25 21:03:04 +02:00
Enno Rehling 4bf4f088b0 BUG 2346: restore old unit limits 2017-08-25 14:10:43 +02:00
Enno Rehling 6d1fe2842a leak: free special directions. 2017-08-25 08:52:15 +02:00
Enno Rehling 6b7da57e28 Merge pull request #724 from ennorehling/master 
version 3.13 release
 2017-08-24 17:32:10 +02:00
Enno Rehling 77f6e7adb4 Merge pull request #723 from ennorehling/develop 
syncing master and develop for 3.14
 2017-08-24 17:24:00 +02:00
Enno Rehling 4bb6d503ea upgrade version number, ready for 3.14 development 2017-08-24 17:00:36 +02:00
Enno Rehling c5bd67d62b Merge branch 'master' into develop 2017-08-24 16:59:49 +02:00
Enno Rehling 9a7da6aea3 Merge branch 'develop' 2017-08-24 16:57:14 +02:00
Enno Rehling b70f0e9977 do not allow install from the wrong branch 2017-08-24 16:57:02 +02:00
Enno Rehling 2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling eb5616aa19 Merge remote-tracking branch 'upstream/master' 2017-08-24 14:13:46 +02:00
Enno Rehling fc4bde47f6 kill the old curses enum and oldcursename. 2017-08-21 20:48:00 +02:00
Enno Rehling 7985ebe511 replace ct_find calls with constants. 
reorder a lot of includes.
 2017-08-21 20:18:19 +02:00
Enno Rehling c99e92db20 kill curse cache logic, it was a bad idea. 
ct_find is almost never what we want to do.
 2017-08-21 19:43:35 +02:00
Enno Rehling 134ff982ba BUG 2358: Schiffbeschleunigung dauert laenger als eine Woche. 2017-08-20 19:07:52 +02:00
Enno Rehling ef68b8123d smart(er) dynamic allocation of key memory. 2017-08-20 17:45:03 +02:00
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