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

7427 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
388ea174ef disable conversion warning (for mtrand code). 
do not know how to do it selectively, so disabling all of it.
 2016-09-04 13:09:10 +02:00
Enno Rehling
2ccd2c0c16 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-04 10:47:40 +02:00
Enno Rehling
00c4c337ff remove crypto submodule, stea mtrand from it 2016-09-04 10:47:21 +02:00
Enno Rehling
f0892ca258 Merge pull request #12 from eressea/develop 
current development version
 2016-09-02 17:41:59 +01:00
Enno Rehling
b5298f60bf Merge pull request #552 from ennorehling/issue-551-description 
issue #551 and some other tests
 2016-09-02 15:43:08 +01:00
Enno Rehling
4e323f8120 bugfix #551: do not return a stack buffer that isn't static 2016-09-02 16:18:45 +02:00
Enno Rehling
b725e9676a simple test for basic unit descriptions 2016-09-02 09:29:52 +02:00
Enno Rehling
02374cd492 fix intermittent piracy test. 
https://bugs.eressea.de/view.php?id=2233
 2016-09-02 09:09:55 +02:00
Enno Rehling
ed2c4ec56a missing null-check before isparam 2016-09-01 21:57:50 +02:00
Enno Rehling
3a719226a2 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-01 21:55:52 +02:00
Enno Rehling
9f7e4effc2 Merge branch 'master' of github.com:eressea/server 2016-09-01 21:51:45 +02:00
Enno Rehling
3060b3d7b6 Merge pull request #550 from ennorehling/hotfix/bug-2233-piracy 
hotfix for bug 2232 and 2233
 2016-09-01 20:50:31 +01:00
Enno Rehling
a75b591784 Fix the nocostbuilding curse description. 
https://bugs.eressea.de/view.php?id=2232
 2016-09-01 20:49:05 +01:00
Enno Rehling
fed399042d fix piracy order aliasing issue #549 
https://bugs.eressea.de/view.php?id=2233
piracy_cmd always works on u->thisorder, does not need an argument.
 2016-09-01 20:40:07 +01:00
Enno Rehling
b321918cd1 check and fix destroy_cmd syntax error handling 2016-08-31 20:38:20 +02:00
Enno Rehling
3c1704e691 Merge remote-tracking branch 'upstream/develop' into develop 2016-08-31 18:51:29 +01:00
Enno Rehling
87fed5b7d2 Merge pull request #548 from ennorehling/refactor-volcano 
new tests, TODOs removed, remove code duplication
 2016-08-31 17:19:29 +01:00
Enno Rehling
298b3893f2 update development version 2016-08-31 18:18:51 +02:00
Enno Rehling
6204bdc000 Merge branch 'develop' 2016-08-31 18:17:50 +02:00
Enno Rehling
a858ceda76 release version 3.9.1 2016-08-31 18:15:54 +02:00
Enno Rehling
a08ad52809 Merge branch 'develop' 
Conflicts:
	src/util/log.c
 2016-08-31 18:15:07 +02:00
Enno Rehling
f722364090 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-08-31 17:40:50 +02:00
Enno Rehling
24c877d974 reduce failing test to less code 2016-08-31 17:38:33 +02:00
Enno Rehling
8aec1c3e7f narrowing down the memory leak in jsonconf.test.c, by adding a similar 
test to umlaut.test.c that exhibits the same behavior in a simpler
setting.
 2016-08-31 17:37:07 +02:00
Enno Rehling
ef487fd8e3 Merge remote-tracking branch 'upstream/develop' into develop 2016-08-31 16:59:52 +02:00
Enno Rehling
1f303c6471 Merge pull request #547 from ennorehling/bug-2231-seaserpent 
Neu erzeugte Seeschlangen bekommen keinen "Einheit barf" Namen mehr.
 2016-08-31 16:58:55 +02:00
Enno Rehling
1eb0fd758a fix broken seaserpent test 2016-08-31 16:47:36 +02:00
Enno Rehling
8a157de36c only name monsters that have a naming function. test is bad, failing. 2016-08-31 16:43:02 +02:00
Enno Rehling
9a72157cf3 split out seaserpent creation for testing 2016-08-31 11:35:07 +02:00
Enno Rehling
61a1cfa141 fix build script jobs determination on mac 2016-08-31 09:50:28 +02:00
Enno Rehling
38145cd57c Merge branch 'bug-2231-seaserpent' of github.com:ennorehling/eressea into bug-2231-seaserpent 2016-08-31 09:44:28 +02:00
Enno Rehling
cd46bac132 fix mac build with clang 7.3 2016-08-31 09:42:36 +02:00
Enno Rehling
39b355073b fix mac build with clang 7.3 2016-08-31 09:32:17 +02:00
Enno Rehling
fa729ba972 fix mac build with clang 7.3 2016-08-31 09:26:48 +02:00
Enno Rehling
afeea58999 fix include order 2016-08-30 21:22:32 +02:00
Enno Rehling
a1d56acfe6 missing include, I believe 2016-08-30 20:15:28 +01:00
Enno Rehling
d9e541843b further reduce number of bt_find calls. 2016-08-30 09:36:09 +01:00
Enno Rehling
5bb9a10a46 is_building_type should be a quicker way to test for a building type than bt_find. 2016-08-30 09:13:59 +01:00
Enno Rehling
fdc91c01a0 remove some FIXME comments 2016-08-30 07:56:40 +01:00
Enno Rehling
2d1a13a811 death to static caches! 2016-08-30 07:51:05 +01:00
Enno Rehling
257d5c18bb remove unused FASTER_SKILLMOD optimization 2016-08-30 07:39:57 +01:00
Enno Rehling
ce7eb9663a remove dead phoenix feature. 2016-08-29 20:56:00 +01:00
Enno Rehling
eee4fa9e91 I am pretty sure the phoenix doesn't work. 2016-08-29 20:53:53 +01:00
Enno Rehling
d0c1b2daa4 that's all folks. no more static curse_type caches. 2016-08-29 20:36:26 +01:00
Enno Rehling
873e6f8086 remove more static curse_type variables 2016-08-29 20:34:30 +01:00
Enno Rehling
f47113e9bd eliminate static curse variables (gbdream & more) 2016-08-29 20:31:18 +01:00
Enno Rehling
1a1ec3f363 cleanup: remove static curse_type variables. 2016-08-29 20:12:31 +01:00
Enno Rehling
b43ac6ab27 remove static initialization code 2016-08-29 19:52:43 +01:00
Enno Rehling
aa998166e4 optimization: the orcish curse is pretty rare, and we are spending a lot of time on processing it. 
remove static variables.
 2016-08-29 19:44:43 +01:00
Enno Rehling
8ff26eb0e4 optimization: no need to look for a curse if unit has no attribs. 2016-08-29 19:41:21 +01:00