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

8687 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
aeeb13bb53 BUG 2318: Go, Ponnuki, Go! 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:35:55 +02:00
Enno Rehling
1c509485f7 Merge pull request #682 from ennorehling/develop 
cmake changes, skillmod rewrite
 2017-04-08 22:14:53 +02:00
Enno Rehling
989ff65ca9 BUG 2318: disable ponnuki 2017-04-08 22:08:19 +02:00
Enno Rehling
ff194967f2 BUG 2318: disable ponnuki 2017-04-08 22:07:59 +02:00
Enno Rehling
599b4a8311 BUG 2318: disable ponnuki 2017-04-08 22:07:12 +02:00
Enno Rehling
c6a8a76e31 strip skillmod down to the essentials. 2017-04-02 20:17:39 +02:00
Enno Rehling
7dd79a1e79 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-02 19:21:44 +02:00
Enno Rehling
d7f69dfa27 enum type clarification 2017-04-02 19:21:37 +02:00
Enno Rehling
50eb35edf6 unused variable 2017-04-02 15:50:29 +02:00
Enno Rehling
7c680481de iron golems can build dwarf armor in E3. 2017-04-02 15:43:14 +02:00
Enno Rehling
8bb7cf8878 WIP: this error has a new message. 2017-04-02 15:39:50 +02:00
Enno Rehling
e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling
4aa26343f6 the LOMEM define has never been used, kill it. 2017-04-01 20:08:04 +02:00
Enno Rehling
329ab2be2a update to cmake-fixed submodules 2017-04-01 11:42:48 +02:00
Enno Rehling
0ff9f1601c de-clutter header file. 2017-04-01 11:39:50 +02:00
Enno Rehling
967e70a4e1 SMF_RIDING is unused. 2017-04-01 11:39:41 +02:00
Enno Rehling
ed99f60186 decluttering settings.h 2017-03-31 21:37:30 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
57ae21a823 remove an obsolete always-true constant 2017-03-31 21:26:07 +02:00
Enno Rehling
37f3c02ceb do not write reports in tests. 2017-03-30 23:18:50 +02:00