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

10072 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
1eceef540a Merge branch 'master' of github.com:ennorehling/eressea 2018-10-31 07:00:13 +01:00
Enno Rehling
0ca2523ea7 Merge branch 'allies' of github.com:ennorehling/eressea into allies 2018-10-31 06:59:48 +01:00
Enno Rehling
b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling
a8ff6d2a99 gmtool can now select and highlight islands. 2018-10-30 20:11:35 +01:00
Enno Rehling
54307d3b50 can read and write struct allies. 2018-10-30 18:45:13 +01:00
Enno Rehling
a26438c175 Merge branch 'develop' into allies 2018-10-30 18:40:15 +01:00
Enno Rehling
bf9c50cfc5 gcc flag to prevent use of VLA 2018-10-30 06:31:30 +01:00
Enno Rehling
253849416a create referenced factions early instead of read_faction_reference. 2018-10-30 06:30:32 +01:00
Enno Rehling
ed6a6b4cf2 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-30 06:28:09 +01:00
Enno Rehling
00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling
da9d3d3573 Merge branch 'master' into develop 2018-10-29 20:10:51 +01:00
Enno Rehling
c54ab6a3df fix CID 189401 and 189402 2018-10-29 20:06:18 +01:00
Enno Rehling
e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
89d752bc1f BUG 2508: wipe edges with 0 2018-10-29 16:19:29 +01:00
Enno Rehling
eba89b3eda Merge branch 'master' of https://github.com/ennorehling/eressea 2018-10-28 21:56:36 +01:00
Enno Rehling
e5207fd1c7 do not backup eressea.db right now 2018-10-28 21:55:34 +01:00
Enno Rehling
6326664b86 BUG 2505 proof by test. 2018-10-28 21:48:52 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling
113a6e68c7 BUG 2507: LERNE AUTO with invalid skill. 2018-10-28 21:27:24 +01:00
Enno Rehling
558390a4a6 separate ally_ api from allies_ api, 
delete unallied factions,
start worrying about serialization.
 2018-10-28 13:45:36 +01:00
Enno Rehling
485dacc25a
Merge pull request #813 from ennorehling/develop 
Monster AI changes, HELFE Refacoring
 2018-10-27 21:56:25 +02:00
Enno Rehling
1364750687 update copyright date 2018-10-26 22:24:04 +02:00
Enno Rehling
84947a7d07 unused variable 2018-10-26 22:21:38 +02:00
Enno Rehling
7537f8c8ed unused function 2018-10-26 22:18:06 +02:00
Enno Rehling
2e076aab1e ally_add is now module-private 2018-10-26 22:16:34 +02:00
Enno Rehling
1e8c7224a4 make consistent use of get_group. 2018-10-26 22:12:43 +02:00
Enno Rehling
d7a8a9b406 fix that catastrophic merge, make struct ally module-private 2018-10-26 21:49:58 +02:00
Enno Rehling
56ccb18fb1 oh my god, please no. 2018-10-26 20:57:59 +02:00
Enno Rehling
ac3a4d91c9 simplicate the use of ally.c 2018-10-26 19:47:50 +02:00
Enno Rehling
557c624200 contant name conflict resolved 2018-10-26 16:08:55 +02:00
Enno Rehling
d1b4a47e1f Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-26 16:08:26 +02:00
Enno Rehling
b3361e3ccb Merge branch 'develop' into allies 2018-10-26 14:13:28 +02:00
Enno Rehling
c3d9e9dbaf report allies without bsdstring 2018-10-26 14:13:00 +02:00
Enno Rehling
6007628096 report.c is next 2018-10-26 14:00:48 +02:00
Enno Rehling
0ac3dc5ead WIP: refactor allies api 2018-10-26 10:54:09 +02:00
Enno Rehling
1be7daf516 Merge branch 'dbstring' into develop 2018-10-25 16:31:01 +02:00
Enno Rehling
be0c0161da use swap database for unit descriptions. 2018-10-24 20:21:21 +02:00
Enno Rehling
53e123b36a do not use unit.display directly, use getter/setter instead. 2018-10-24 20:16:17 +02:00
Enno Rehling
516a53c0c7 swap faction.banner to database 2018-10-24 19:54:07 +02:00
Enno Rehling
da3270517a fix type conversion and incomplete database test. 2018-10-24 19:39:30 +02:00
Enno Rehling
32009b7043 store passwords in swapdb 2018-10-24 09:27:48 +02:00
Enno Rehling
83959c375f kill orderdb.[hc] files 2018-10-24 09:02:19 +02:00
Enno Rehling
5ab7c8cc65 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-10-24 07:12:04 +02:00
Enno Rehling
6738962d73 missing files 2018-10-24 07:00:26 +02:00
Enno Rehling
b8ee5b3c76 begin the work to swap strings to database 2018-10-23 22:31:42 +02:00
Enno Rehling
6a615ab0cd disable ASM implementation of bcrypt 2018-10-23 17:43:11 +02:00
Enno Rehling
35ed981cd5 help the VS heap profiler understand the code. 
reorder calloc arguments.
rename ursprung -> origin.
 2018-10-22 21:51:11 +02:00
Enno Rehling
835d900f73 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-22 20:23:21 +02:00