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

6996 Commits

Author SHA1 Message Date
Enno Rehling b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling 21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling 741804d98d Merge pull request #508 from ennorehling/develop 
fix key-upgrade function (coverity CID 102076)
 2016-05-07 15:20:42 +02:00
Enno Rehling 65a163b4d9 do not seed new factions if there isn't a minimum number of them 2016-05-05 13:51:31 +02:00
Enno Rehling 65432748fb eliminate false positive CID 26252 (itoa36 is always 4 chars or less) 2016-05-04 16:35:07 +02:00
Enno Rehling 80716d0787 fix key-upgrade function (coverity CID 102076) 
fix MSVC warning (strncpy)
 2016-05-02 19:22:57 +02:00
Enno Rehling c4d31d368e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/util/log.c
	src/util/log.h
 2016-05-01 13:47:30 +02:00
Enno Rehling 0557aa84ac release version 3.8.9 2016-05-01 13:40:10 +02:00
Enno Rehling f24b1c1cdc fix multi-logging 2016-05-01 13:40:01 +02:00
Enno Rehling 41277ed5ee prove that logging is broken (new test segfaults) 2016-05-01 13:39:25 +02:00
Enno Rehling 1fa1693119 test multiple loggers 2016-05-01 13:36:00 +02:00
Enno Rehling 13156a47a4 Merge pull request #507 from ennorehling/hotfix/bug-2201-remove_empty_factions 
Hotfix bug 2201, crash E3 turn 351
 2016-04-03 13:23:29 +02:00
Enno Rehling b2e8c75c02 add a test that should have crashed before my fix. 2016-04-03 12:37:26 +02:00
Enno Rehling 30b3cff657 fix a crash in write_game caused by remove_empty_factions 
https://bugs.eressea.de/view.php?id=2201
 2016-04-03 12:23:51 +02:00
Enno Rehling be89aaeb83 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-03-26 22:28:14 +01:00
Enno Rehling bc8c39f4bb fix message-crash https://bugs.eressea.de/view.php?id=2199 
release version 3.8.7
 2016-03-26 22:09:21 +01:00
Enno Rehling 108b4404d2 Merge pull request #502 from ennorehling/feature/refactor-study 
refactor study.c
 2016-03-26 14:53:26 +01:00
Enno Rehling 29b715d128 Merge pull request #503 from ennorehling/refactor-cfindhash 
Kill cfindhash and the old Alp spell
 2016-03-26 14:53:03 +01:00
Enno Rehling 98a3b31953 cfindhash is gone 2016-03-25 21:51:49 +01:00
Enno Rehling 75f2be75d8 remove code for alp (non-functional) 
remove code for removecurse trigger (only used by alp)
 2016-03-25 21:18:57 +01:00
Enno Rehling 2a8013f3f9 fix bug 2194, poorly 2016-03-25 17:05:01 +01:00
Enno Rehling 5c9aaa6245 fix experimental separation of test-only code 2016-03-24 22:32:29 +01:00
Enno Rehling 547532bc63 remove deprecated learn_skill function and configuration 2016-03-24 22:31:07 +01:00
Enno Rehling f55168e7de repair the test for academies, make academy bonus use non-deprecated learn_skill 2016-03-24 13:44:29 +01:00
Enno Rehling 87b09cd3c6 refactor tests to use test locale where possible 2016-03-24 13:01:47 +01:00
Enno Rehling aba0be505e refactor many tests to use the test locale instead of building their own 2016-03-24 13:01:47 +01:00
Enno Rehling 796f50bd93 test: teach differnt skills to different units 2016-03-24 13:01:46 +01:00
Enno Rehling 41000fcd5e test more complex learn/teach combinations 2016-03-24 13:01:45 +01:00
Enno Rehling 36eb36f7a0 new test: one teacher, two student units 2016-03-24 13:01:44 +01:00
Enno Rehling 3aa110cfe6 study/teach: testing some easy edge cases 2016-03-24 13:01:44 +01:00
Enno Rehling 267dafcee5 very basic tests for teach and study 2016-03-24 13:01:43 +01:00
Enno Rehling be6a7a5e39 refactor test_create_locale 
- create a mostly functional locale for testing
- use it for test factions
refactor learn_skill injection
- use days, not chance
- fix or mutilate broken tests
 2016-03-24 13:01:42 +01:00
Enno Rehling f97b6c9821 bug: learn_skill was not learning the right skill 
refactor: further reduce learn_skill_depr usage
 2016-03-24 13:01:42 +01:00
Enno Rehling 0464fb629a remove some dead declarations 2016-03-24 13:01:41 +01:00
Enno Rehling e75843e5c1 learn_skill tests were unstable because of random progress (disable it) 2016-03-24 13:01:40 +01:00
Enno Rehling 18c8148b74 narrow down test failure to a unit test. 
learn_skill doesn't use u->number!
 2016-03-24 12:59:51 +01:00
Enno Rehling c91da12883 refactor demon_skillchange to use learn_skill 
Also extracting it into the study module. No idea yet how I am going to sense this for a test, so the test currently does nothing.
 2016-03-24 12:59:50 +01:00
Enno Rehling af83efca44 rewrite learn_skill to not use the deprecated function. 2016-03-24 12:51:23 +01:00
Enno Rehling b5a4faa745 deprecate learn_skill taking a double 
- introduce days-based learn_skill
- add a simple test
 2016-03-24 12:51:21 +01:00
Enno Rehling cae966f4fe nextborder wurde nicht gelesen, wird aber gebraucht 2016-03-13 09:49:04 +01:00
Enno Rehling f962ec360e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-03-12 15:27:55 +01:00
Enno Rehling 2c6a39ebb0 release version 3.8.6 2016-03-12 15:25:13 +01:00
Enno Rehling 3e6d4ab908 Merge pull request #501 from ennorehling/stm2-bug_2187 
hotfix: bug 2187 (demon hunger)
 2016-03-12 15:23:49 +01:00
Enno Rehling fcc26bcbf3 fix broken json 2016-03-12 15:06:45 +01:00
Enno Rehling ff395b2e24 Merge branch 'bug_2187' of https://github.com/stm2/server into stm2-bug_2187 2016-03-12 15:03:06 +01:00
Enno Rehling 95b0a0ad9c Merge pull request #499 from ennorehling/feature/bug-2194-academy-refactoring 
academy refactoring for bug 2194
 2016-03-11 21:48:56 +01:00
Enno Rehling ae7d86dae0 just a little bit of refactoring 2016-03-11 21:36:10 +01:00
Enno Rehling d83bd3bec5 memory leak: finally found that coast leak. bad test was overwriting coasts without free (setting custom coasts in a test is not easy). 2016-03-11 11:52:36 +01:00
Enno Rehling 637054bc22 memory leak: clean up mstream after test 2016-03-11 11:33:45 +01:00
Enno Rehling b81f9db074 memory leak: free race->parameters 2016-03-11 11:31:05 +01:00