Enno Rehling
|
5e5882d674
|
extracting volcano code into a separate module (step one)
|
2016-08-21 21:21:56 +02:00 |
Enno Rehling
|
a47b48cfbf
|
Merge pull request #546 from ennorehling/refactor-maintenance
refactoring maintenance
|
2016-08-21 20:50:51 +02:00 |
Enno Rehling
|
a42bd9c3bf
|
remove the BLD_WORKING flag.
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
|
2016-08-21 20:12:28 +02:00 |
Enno Rehling
|
d3e05c7ddf
|
merge in and fix the economy tests
|
2016-08-21 20:04:51 +02:00 |
Enno Rehling
|
43090e1492
|
remove any reference to old two-stage maintenance.
getting rid of a lot of dead code.
|
2016-08-21 20:02:20 +02:00 |
Enno Rehling
|
901cf97cb2
|
refactoring the "nocostbuilding" curse.
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
|
2016-08-21 20:02:19 +02:00 |
Enno Rehling
|
b2e79dc5e9
|
building maintenance unit tests.
backfilling some very basic test coverage.
|
2016-08-21 20:01:30 +02:00 |
Enno Rehling
|
2df881c6ed
|
check the results of MAKE TEMP
new units have the UFL_ISNEW flag
|
2016-08-21 12:38:25 +02:00 |
Enno Rehling
|
348a8c24c0
|
Merge pull request #545 from ennorehling/bug-2230-give-dead
Bug 2230: do not allow GIVE to dead units
|
2016-08-21 12:01:57 +02:00 |
Enno Rehling
|
a5c7d9b615
|
fix giving items to dead units, https://bugs.eressea.de/view.php?id=2230
|
2016-08-21 11:58:53 +02:00 |
Enno Rehling
|
6cfdc50fdf
|
add unit tests for giving stuff to empty units.
should only be allowed to give things to a new unit, not a recently
deceased.
https://bugs.eressea.de/view.php?id=2230
|
2016-08-21 11:46:54 +02:00 |
Enno Rehling
|
ad80c5a889
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2016-08-21 07:00:00 +02:00 |
Enno Rehling
|
b5ed9e96dd
|
re-enable disabled test (it passes, so what gives?)
|
2016-08-21 06:59:43 +02:00 |
Enno Rehling
|
8902187a9a
|
Merge pull request #544 from ennorehling/develop
issue #538: default terrain
|
2016-08-21 05:04:52 +02:00 |
Enno Rehling
|
6ca3f04b89
|
issue #538: default terrain
I think it's unnecessary, so delete it
|
2016-08-20 23:42:15 +02:00 |
Enno Rehling
|
17c88fa48d
|
Merge pull request #543 from ennorehling/bug-2228-tunneling
Bug 2228: piracy between land regions
|
2016-08-20 19:33:04 +02:00 |
Enno Rehling
|
9a6d4a174a
|
remove move_on_land argument from move_cmd
|
2016-08-20 19:25:44 +02:00 |
Enno Rehling
|
6c17cf9d17
|
remove move_on_land from sail()
|
2016-08-20 19:24:18 +02:00 |
Enno Rehling
|
860078cfc9
|
fix piracy_cmd_land_to_land
|
2016-08-20 19:10:53 +02:00 |
Enno Rehling
|
c755de1cd5
|
fix the bug (move_on_land must die).
disable broken test (setup_pirate is incomprehensible gibberish).
|
2016-08-20 17:25:04 +02:00 |
Enno Rehling
|
1c4c0602f9
|
reactivate disabled piracy test, watch it fail
|
2016-08-20 11:06:46 +02:00 |
Enno Rehling
|
1ef8049668
|
adding Solthar's test to show that the bug exists
|
2016-08-19 18:22:38 +02:00 |
Enno Rehling
|
9e901b47b6
|
I'm getting reports of leaks for umlaut.c based structures and configuration?
This is not actually solving those, though.
clean up report directory, fix .bat file.
|
2016-08-18 20:07:16 +02:00 |
Enno Rehling
|
39a284b423
|
quick and dirty .bat file to run drmemory on the server.
|
2016-08-18 19:46:29 +02:00 |
Enno Rehling
|
5d44874807
|
Merge pull request #542 from ennorehling/feature/plane-enhancements
Some code cleanup for planes
|
2016-08-18 19:23:58 +02:00 |
Enno Rehling
|
3be627d6ef
|
fix compilation
|
2016-08-18 19:13:31 +02:00 |
Enno Rehling
|
ecffed0577
|
verify data after deleting planes, do not delete plane 50 (yet)
|
2016-08-18 19:11:26 +02:00 |
Enno Rehling
|
e5f5dc6aa4
|
fail when there are borders that can't be read because their endpoints are missing
|
2016-08-18 19:11:10 +02:00 |
Enno Rehling
|
abd6600cfe
|
when reading alliances, duplicate ids are impossible.
makealliance does too much work, new_alliance is simpler.
|
2016-08-18 19:09:43 +02:00 |
Enno Rehling
|
a3ff8781c4
|
setting herbs will warn if they are the wrong herbs.
planes can be erased.
add a script that erases unused planes from E2.
|
2016-08-18 19:04:48 +02:00 |
Enno Rehling
|
0c6defad91
|
extract read_planes into a separate function.
|
2016-08-18 18:59:30 +02:00 |
Enno Rehling
|
ecc2eaf999
|
Merge branch 'master' of github.com:ennorehling/eressea
Conflicts:
src/kernel/save.c
|
2016-08-13 19:56:48 +02:00 |
Enno Rehling
|
3e47f02fc2
|
coverity CID 141509 Unchecked return value from library
Conflicts:
src/util/log.c
|
2016-08-13 10:18:42 +02:00 |
Enno Rehling
|
43c2c74d75
|
correct the list of glacier herbs.
this will fix newly created glaciers only.
there are several bad glaciers in E2, this commit is not repairing
them.
https://bugs.eressea.de/view.php?id=2220
|
2016-08-13 10:13:22 +02:00 |
Enno Rehling
|
851ae00835
|
Merge pull request #537 from ennorehling/develop
CID 141509 Unchecked return value from library
|
2016-08-09 18:37:06 +02:00 |
Enno Rehling
|
1735ec9eee
|
coverity CID 141509 Unchecked return value from library
|
2016-08-09 18:28:15 +02:00 |
Enno Rehling
|
391ef692b9
|
Merge branch 'ennorehling-test-alliance' into develop
|
2016-08-08 08:46:49 +02:00 |
Enno Rehling
|
238a0e22f2
|
Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance
Conflicts:
src/util/CMakeLists.txt
|
2016-08-08 08:46:09 +02:00 |
Enno Rehling
|
f83770dca8
|
Merge pull request #535 from ennorehling/gmtool-unicode
gmtool: clumsy codepage translation
|
2016-08-07 19:34:58 +02:00 |
Enno Rehling
|
b4135e49fb
|
unused variable
|
2016-08-07 19:20:41 +02:00 |
Enno Rehling
|
731238dfb1
|
support different editor codepages
|
2016-08-07 19:19:35 +02:00 |
Enno Rehling
|
400051332a
|
Trying out some different codepages for pdcurses/WIN32 and ncurses/Linux.
|
2016-08-07 18:55:03 +02:00 |
Enno Rehling
|
69c0194628
|
curses output doesn't deal well with non-ascii characters. "Fix" UTF8 characters by replacing them with ?
|
2016-08-07 18:25:28 +02:00 |
Enno Rehling
|
5dcbb8a3f4
|
add a very simple tst for unicode comparisons
|
2016-08-07 10:28:09 +02:00 |
Enno Rehling
|
4f5bd43dcf
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
|
2016-08-07 00:47:50 +02:00 |
Enno Rehling
|
bea8b05ee9
|
Merge pull request #534 from ennorehling/hotfix-bug-2222-nmrdeath
bug 2222: death by NMR was broken
|
2016-08-07 00:45:30 +02:00 |
Enno Rehling
|
44b6a87649
|
death by NMR was broken, because I can't write loops good.
|
2016-08-07 00:40:10 +02:00 |
Enno Rehling
|
575f5fa355
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2016-08-06 23:31:33 +02:00 |
Enno Rehling
|
b1f729a379
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
|
2016-08-06 23:30:59 +02:00 |
Enno Rehling
|
ae3e5b8088
|
release version 3.8.15
|
2016-08-06 23:27:23 +02:00 |