Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8908 commits 10 branches 0 tags 41 MiB
Commit graph

8908 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
e1afdd95bf Merge branch 'order_id' of https://github.com/ennorehling/eressea.git 2017-10-14 08:28:32 +02:00
Enno Rehling
5a40ff9e62 merge conflict fix 2017-10-13 19:35:12 +02:00
Enno Rehling
78360b1466 refactoring: move order_data to orderdb module. 2017-10-13 19:34:39 +02:00
Enno Rehling
8a5164806b try fixing coverity complaints 2017-10-13 19:33:29 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
394839f7a4 WIP: optimized study orders, failing 15 study tests 2017-10-13 19:33:28 +02:00
Enno Rehling
1033143411 fix gcc build 2017-10-13 19:33:28 +02:00
Enno Rehling
42f7be4bb9 do not use a list to store several million entries. 2017-10-13 19:33:28 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
2b54605080 remove order de-duplication for short and study orders. 2017-10-13 19:33:27 +02:00
Enno Rehling
db0bd8d4db refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-13 19:33:27 +02:00
Enno Rehling
9ff98b5b23 more fine-grained testing for cansee 2017-10-13 19:32:31 +02:00
Enno Rehling
d8ac84c0a4 Merge pull request #735 from ennorehling/develop 
fix more stuff
 2017-10-13 19:15:05 +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
3734994244 merge conflicts 2017-10-12 18:12:55 +02:00
Enno Rehling
cbaf4bfd04 refactoring: move order_data to orderdb module. 2017-10-12 18:11:21 +02:00
Enno Rehling
c5b9c8ab06 magic definitions for unix file command 2017-10-11 23:05:35 +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
0a0806a181 try fixing coverity complaints 2017-10-10 09:29:32 +02:00
Enno Rehling
fc80f2bd8c hackish optimization for STUDY orders 2017-10-09 20:33:47 +02:00
Enno Rehling
f62c0866e3 WIP: optimized study orders, failing 15 study tests 2017-10-09 18:25:57 +02:00
Enno Rehling
905873e48b fix gcc build 2017-10-08 18:49:14 +02:00
Enno Rehling
710fcd0a08 do not use a list to store several million entries. 2017-10-08 18:41:59 +02:00
Enno Rehling
28d75f7cfc remove the locale from orders. 2017-10-08 17:09:32 +02:00
Enno Rehling
97ff152f17 remove order de-duplication for short and study orders. 2017-10-08 15:34:40 +02:00
Enno Rehling
828ca5f5f6 refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-08 12:39:41 +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
06067655a3 Merge pull request #733 from ennorehling/develop 
BUG 2369 workaround: do not assert at_mage.
 2017-10-07 21:05:52 +02:00
Enno Rehling
9d1e1a2e32 BUG 2369 workaround: do not assert at_mage. 2017-10-07 20:44:50 +02:00
Enno Rehling
734c355ec3 Merge pull request #732 from ennorehling/develop 
refactor readorders
 2017-10-07 20:28:01 +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
0ca0543c6e Merge pull request #731 from ennorehling/develop 
BUG 2367, 2368: familiars
 2017-10-07 18:52:45 +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