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

8707 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
33aa46674f Merge pull request #688 from ennorehling/develop 
fix a crash, refactor fumbles
 2017-04-30 03:51:49 +02:00
Enno Rehling
1885831204 remove handle_events for unused events. 2017-04-30 03:48:50 +02:00
Enno Rehling
80e6ed0863 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 03:42:50 +02:00
Enno Rehling
e5f898ce87 bugfix: portals crash buildingtype(). 
only type that has no construction.
 2017-04-30 03:42:39 +02:00
Enno Rehling
e6f8c943fa refactor the special fumble functions for spells. 
removed from struct spell.
funpointers in structs are bad, mkay.
 2017-04-30 03:27:28 +02:00
Enno Rehling
3d13cb8968 Merge pull request #687 from ennorehling/develop 
refactor buildings: taxes, names, tests
 2017-04-29 21:58:32 +02:00
Enno Rehling
6f4a8b5df1 header cleanup 2017-04-29 21:50:17 +02:00
Enno Rehling
931e705b05 delete unused functions 2017-04-29 20:37:02 +02:00
Enno Rehling
7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling
3b9a6e45a1 turns out: btype->age is never used. 2017-04-29 13:53:28 +02:00
Enno Rehling
8928c9d3cf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-29 13:37:45 +02:00
Enno Rehling
3f8de76b9d fix largestbuilding, broken in prev commit. 2017-04-29 13:37:34 +02:00
Enno Rehling
dee10e8d0d remove suspicious disabled code 2017-04-28 21:58:27 +02:00
Enno Rehling
bdc7457a08 additional testing for largestbuilding and comparisons. 2017-04-28 21:30:05 +02:00
Enno Rehling
1112890293 use building_taxes everywhere. 
make it return an integer, not double.
 2017-04-28 20:10:20 +02:00
Enno Rehling
16267c447e extract taxes into separate function (WIP) 2017-04-27 19:08:10 +02:00
Enno Rehling
a313e78de5 move building names from function to construction data. 2017-04-26 21:44:24 +02:00
Enno Rehling
f2d8392206 add tests for correct castle stage names. 2017-04-25 16:47:26 +02:00
Enno Rehling
8b02c540fd re-enable accidentally disabled tests 2017-04-25 13:27:13 +02:00
Enno Rehling
45f8f73ede broaden valgrind suppression for strtold 2017-04-23 16:13:28 +02:00
Enno Rehling
c0d0ee6374 Merge branch 'master' into develop 2017-04-22 19:09:58 +02:00
Enno Rehling
1cd8a53232 whitespace framing equals 2017-04-22 19:07:47 +02:00
Enno Rehling
7f9c85384a build script madness, again 2017-04-22 19:06:38 +02:00
Enno Rehling
9c6108f965 Merge branch 'master' into develop 2017-04-22 19:05:58 +02:00
Enno Rehling
376fc0265c Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/build
 2017-04-22 19:05:14 +02:00
Enno Rehling
1eb189cf47 shell wants spaces around = for string compares? 2017-04-22 19:03:08 +02:00
Enno Rehling
1e3abb3df6 Merge branch 'master' into develop 2017-04-22 18:58:52 +02:00
Enno Rehling
bda395d374 shell wants ==, not = for string compares? 2017-04-22 18:57:57 +02:00
Enno Rehling
28720947a6 Merge pull request #686 from ennorehling/develop 
latest changes and bugfixes
 2017-04-22 18:48:35 +02:00
Enno Rehling
3682fb472e Merge pull request #685 from ennorehling/master 
Bugfixes for Ponnuki and Demon Stealth
 2017-04-22 18:47:57 +02:00
Enno Rehling
091a8de6b6 Merge branch 'master' into develop 
Conflicts:
	src/kernel/race.c
	src/spy.c
 2017-04-22 18:38:34 +02:00
Enno Rehling
e530543022 demon stealth: cloak as other race. 
added a Lua test.
get_race oob fix (potential crash).
 2017-04-22 18:33:47 +02:00
Enno Rehling
a78ad8310d Merge branch 'master' into develop 2017-04-22 18:08:10 +02:00
Enno Rehling
e938350acd add cmake as part of main project 2017-04-22 18:07:09 +02:00
Enno Rehling
758af589e5 remove cmake as a submodule 2017-04-22 18:01:49 +02:00
Enno Rehling
04ccae5a5e Merge remote-tracking branch 'upstream/develop' into develop 2017-04-22 13:59:37 +02:00
Enno Rehling
7e4f55a1ac enable ponnuki 2017-04-22 13:53:06 +02:00
Enno Rehling
91fc9f9a1e enable ponnuki 2017-04-22 13:52:45 +02:00
Enno Rehling
055fdceff9 fix gcc build 2017-04-17 20:45:01 +02:00
Enno Rehling
9fcab4ccb8 do not hard-code list of allowed races for demons. 2017-04-17 20:18:37 +02:00
Enno Rehling
635ec6d6c6 Fix a crash in TARNE <race> 
this was complicated to test, and I had to rewrite how races and their names are registered by test_create_locale.
 2017-04-17 20:11:44 +02:00
Enno Rehling
b06e93db7a BUG 2317: wyrms in E2 didn't move 2017-04-17 16:50:15 +02:00
Enno Rehling
153ef2056e Merge remote-tracking branch 'upstream/develop' into develop 2017-04-16 16:04:01 +02:00
Enno Rehling
51c2df62ca fixing new coverity scan defects 
167039 Dereference after null check
167038 Unchecked return value
 2017-04-16 15:52:34 +02:00
Enno Rehling
742fa423b3 do not log an ERROR when a familiar as no equipment 2017-04-16 12:36:59 +02:00
Enno Rehling
b82bc0bb9c Merge pull request #684 from ennorehling/develop 
Ponnuki and Farsi
 2017-04-15 20:30:26 +02:00
Enno Rehling
0b226ba75e fix farsi names containing nzwj symbol. 2017-04-10 17:32:32 +02:00
Enno Rehling
b9b1a71d89 Merge branch 'master' of github.com:eressea/server 2017-04-09 13:56:10 +02:00
Enno Rehling
057f676d2c Merge pull request #683 from ennorehling/master 
BUG 2318, 2315: Ponnuki, Plural
 2017-04-09 13:56:04 +02:00
Enno Rehling
aebc7d4cac BUG 2138: Ponnuki is dead, long live Ponnuki 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:40:42 +02:00