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

10539 Commits

Author SHA1 Message Date
Enno Rehling eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling 31d15550ed Add test coverage for NAME ALLIANCE. 2017-11-06 20:38:28 +01:00
Enno Rehling 7196f799e6 add a terrain_changed function for use with static terrain variables. 2017-11-06 20:29:26 +01:00
Enno Rehling c597bebb8b fix drowning (it's not dependeing on icebergs). 2017-11-05 20:52:04 +01:00
Enno Rehling 5b70d605ce gcc is annoying about switch statements 2017-11-05 19:38:42 +01:00
Enno Rehling 373d738084 add a modules.icebergs configuration variable. 2017-11-05 19:35:06 +01:00
Enno Rehling 4b1b98f5ec Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-11-05 19:16:35 +01:00
Enno Rehling 96ff0815c4 newterrain sucks. 2017-11-05 19:15:43 +01:00
Enno Rehling 440679da87 code that uses newterrain needs to set up terrains in tests. 2017-11-05 17:00:40 +01:00
Enno Rehling 2b81334ba2 use the correct swamp terrain, still failing. newterrain is a plague. 2017-11-05 16:43:01 +01:00
Enno Rehling 3fdde8a4aa refactor original trade test to use shared setup function. 2017-11-05 15:14:54 +01:00
Enno Rehling 12646f726a Add a failing test for bug 2379. 2017-11-05 15:11:02 +01:00
Enno Rehling a17c8ada71 Add a test for the happy case of the BUY command. 2017-11-04 20:10:05 +01:00
Enno Rehling 9c24fe4b07 fix gcc build 2017-10-30 18:12:24 +01:00
Enno Rehling 35742e8870 BUG 2376: Abtreiben zeigt immer Nordwesten an. 2017-10-30 18:01:33 +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 ec4aae61ef Merge branch 'master' into develop 2017-10-29 19:02:13 +01:00
Enno Rehling 0277e10c8d BUG 2381: parse_token overrun. 2017-10-29 19:00:18 +01:00
Enno Rehling 5af5daa355 BUG 2378: Fix magic armor resistance calculation. 
Use frac_one constant where applicable.
 2017-10-29 18:55:43 +01:00
Enno Rehling 1866b95e14 BUG 2381: parse_token overrun. 2017-10-29 18:03:44 +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 551f349309 begin work on 3.15 release 2017-10-28 19:46:17 +02:00
Enno Rehling 5373d7755e Merge branch 'develop' 2017-10-28 19:38:36 +02:00
Enno Rehling 79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling 10eb4f9ac9 Merge pull request #736 from ennorehling/develop 
BUG 2374 ATTACKIERE auf Seeschlangen
 2017-10-16 20:53:57 +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 4257a9891c another test. moving some deckchairs around. 2017-10-14 09:01:14 +02:00
Enno Rehling 6d79f85628 orderdb backend choices and first tests. 2017-10-14 08:43:01 +02:00
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