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

8698 Commits

Author SHA1 Message Date
Enno Rehling efa7b16c87 be less verbose in the log 2017-12-17 14:23:50 +01:00
Enno Rehling 4eed2abd71 Merge remote-tracking branch 'upstream/master' 2017-12-16 21:35:06 +01:00
Enno Rehling ec961a8904 shellcheck fixes 2017-12-16 21:17:53 +01:00
Enno Rehling de6afeac5a
Merge pull request #748 from ennorehling/master 
3.14.2 changes to create-orders and gmtool
 2017-12-16 19:53:02 +01:00
Enno Rehling c998770a88 use find instead of ls to get list of order files. 
this addresses the problem leading to bug 2394.

Conflicts:
	process/create-orders
 2017-12-16 19:43:33 +01:00
Enno Rehling 55db0d98c8 syntax error 2017-12-02 21:17:34 +01:00
Enno Rehling 29a6c0ae86 gmtool, highlight and clear chaos 2017-11-21 08:47:35 +01:00
Enno Rehling 01f0b99b64 Merge remote-tracking branch 'upstream/master' 2017-11-19 03:18:06 +01:00
Enno Rehling 97b4806deb Merge branch 'release-13.3' 
Conflicts:
	src/kernel/unit.c
	src/kernel/unit.test.c
 2017-11-19 03:13:16 +01:00
Enno Rehling 1c24628d62 BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:00:18 +01:00
Enno Rehling 7e1f3dbdc5 fix bug 2386, int overflow 2017-11-19 02:56:13 +01:00
Enno Rehling 921dcf5348
Merge pull request #741 from ennorehling/master 
BUG 2383 remove irace assert
 2017-11-18 18:31:38 +01:00
Steffen Mecke 2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling 3f3cdad390 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:30:19 +01:00
Enno Rehling fa01b6fa04
Merge pull request #738 from ennorehling/master 
BUG 2381: parse_token overrun.
 2017-10-29 19:07:14 +01:00
Enno Rehling 0277e10c8d BUG 2381: parse_token overrun. 2017-10-29 19:00:18 +01:00
Enno Rehling c3992c6a6e
Merge pull request #737 from ennorehling/master 
pre-release 3.14 merge
 2017-10-28 20:00:09 +02:00
Enno Rehling 5373d7755e Merge branch 'develop' 2017-10-28 19:38:36 +02:00
Enno Rehling b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling a0a39124f0 additional tests for cansee, to support fixing bug 2374 2017-10-15 20:20:43 +02:00
Enno Rehling 018f217e4d Merge remote-tracking branch 'upstream/master' 2017-10-15 20:08:19 +02:00
Enno Rehling 9ff98b5b23 more fine-grained testing for cansee 2017-10-13 19:32:31 +02:00
Enno Rehling ca6cbe5906 fixing commit 1b53128e1a and adding a test for cansee. 2017-10-13 19:07:57 +02:00
Enno Rehling 8246639e57 test cansee for perception & stealth 2017-10-13 18:41:29 +02:00
Enno Rehling 92f7d0d8a8 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-10-13 18:30:28 +02:00
Enno Rehling a82034b8a7 BUG 2372 canride breakage 2017-10-13 18:30:22 +02:00
Enno Rehling ed23853c4d add valgrind option to runtests, use in travis builds 2017-10-10 21:30:53 +02:00
Enno Rehling 9527460ca4 github issue 734: clear equipments after test. 2017-10-10 20:59:51 +02:00
Enno Rehling 1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling 9d48bfc36c BUG 2366: add a test to verify that view_reality sets an observer. 2017-10-10 18:45:44 +02:00
Enno Rehling 0ffb4e3ca9 small fix to orders.queue locking 2017-10-08 11:26:36 +02:00
Enno Rehling dc2663571c move orders.queue file (clever use of lockfile program) 2017-10-08 11:26:36 +02:00
Enno Rehling 197fd48508 send bz2 report with new mail text location 2017-10-08 11:26:36 +02:00
Enno Rehling a175c84232 create_mage sollte ein existierendes at_mage nicht überschreiben, nur evtl. aktualisieren. 2017-10-08 09:10:41 +02:00
Enno Rehling 9d1e1a2e32 BUG 2369 workaround: do not assert at_mage. 2017-10-07 20:44:50 +02:00
Enno Rehling e87a26d961 Slightly reduce amount of code required for a test. 2017-10-07 20:25:07 +02:00
Enno Rehling 703c6c0385 some examples for how the new orderfile logic can be used to write unit tests. 2017-10-07 20:17:04 +02:00
Enno Rehling c2634bd095 move readorders to orderfile module. 2017-10-07 19:44:23 +02:00
Enno Rehling f3515c8e07 move read_orders to its own module 2017-10-07 19:38:39 +02:00
Enno Rehling b676bb0968 remove unused newfaction.bonus 
thanks to @stm2. This feature is long dead.
 2017-10-07 18:43:04 +02:00
Enno Rehling 5ce4939351 ifndef 2017-10-07 18:08:28 +02:00
Enno Rehling ecce8e5d91 Revert "refactor: extract a read_order function." 
This reverts commit 8b39133dbf.
 2017-10-07 18:06:54 +02:00
Enno Rehling b255af52e2 add a failing integration test for the parser bug 2017-10-07 13:56:14 +02:00
Enno Rehling 0537d39b17 add a fix for 2367 to fix_familiars 2017-10-07 03:22:35 +02:00
Enno Rehling bb54e0d5ab gcc unused variable 2017-10-06 23:18:47 +02:00
Enno Rehling 91182e12f1 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-10-06 22:38:30 +02:00
Enno Rehling 86e265c7c4 miniature is_mage get_mage optimization 2017-10-06 22:38:01 +02:00
Enno Rehling 6265abac74 remove side-effects from movement_speed(). 2017-10-06 22:30:44 +02:00
Enno Rehling c73af8b89b wrap some tests around is_mage and get_mage 2017-10-06 22:01:02 +02:00