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

4242 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
b0fb81640b set warning level for this part of eressea especially high 2013-05-04 17:28:08 -07:00
Enno Rehling
6335d4be3a updated submodules 2013-05-04 15:55:55 -07:00
Enno Rehling
935ba67d27 update to latest CMakelists.txt build files 2013-05-04 15:47:53 -07:00
Enno Rehling
7975249f6a moving the find_package calls out into the parent project(s). 2013-05-04 14:20:30 -07:00
Enno Rehling
1db73ac4c7 rebase merge 2013-05-04 14:18:32 -07:00
Enno Rehling
fdd0a36730 moving the find_package calls out into the parent project(s). 2013-05-04 14:17:12 -07:00
Enno Rehling
2ced59467d Merge branch 'master' of bitbucket.org:enno/eressea 2013-05-04 11:28:25 +02:00
Enno Rehling
30808a8db9 re-order includes to include find_pacakge commands at the top 2013-05-04 11:27:42 +02:00
Enno Rehling
f76dfc71c9 find_package goes into the main CMakeLists.txt, not needed here. 
kill old top-level CMakeLists.txt, also
 2013-05-04 11:26:51 +02:00
Enno Rehling
bc704dbbbb this should not be doing the find_package, that happens in the server 2013-05-03 09:54:59 -07:00
Enno Rehling
eceafaf11c Merge branch 'master' of github.com:eressea/core 2013-05-03 09:53:23 -07:00
Enno Rehling
1e433b9fa6 this should not be doing the find_package, that happens in the server 2013-05-03 09:53:06 -07:00
Enno Rehling
67b9af64b7 updated submodules 2013-05-02 06:09:10 +02:00
Enno Rehling
ebf9fe2c67 unit repair is broken, kill it 
http://bugs.eressea.de/view.php?id=1970
 2013-05-02 06:07:42 +02:00
Enno Rehling
18c0d034d2 Merge branch 'master' of bitbucket.org:enno/eressea 2013-05-02 03:52:36 +02:00
Enno Rehling
b4b8c49934 use getters/setters to access unit::race 2013-05-02 03:50:24 +02:00
Enno Rehling
efc7373fb9 Merge branch 'master' of github.com:eressea/core 
Conflicts:
	src/kernel/reports.c
 2013-05-02 03:48:16 +02:00
Enno Rehling
d817345e3f make unit::race private 2013-05-02 03:46:58 +02:00
Enno Rehling
cd4628421a u_race and u_setrace getter/setter 
moving towards making unit::race private
 2013-05-02 03:42:20 +02:00
Enno Rehling
71fd2a4739 include curses in linker and include flags 2013-05-01 13:24:53 -07:00
Enno Rehling
d313a73de9 import a fix from quicklist 2013-04-28 03:58:08 +02:00
Enno Rehling
903dfb2b27 Repository has moved. Merge branch 'master' of gitolite:eressea 2013-04-28 03:16:24 +02:00
Enno Rehling
ebf8193620 use new version of core 2013-04-28 03:16:04 +02:00
Enno Rehling
90578358ca Merge branch 'master' of github.com:eressea/core 2013-04-28 03:13:55 +02:00
Enno Rehling
ed4c4aa363 Some crashes and other minor stuff. 
Just things that Eressea has changed in the past 2 months
 2013-04-28 03:13:40 +02:00
Enno Rehling
64046250d4 confusion, merge latest changes 2013-02-23 17:27:50 -08:00
Enno Rehling
841876e335 bind faction.flags to Lua 2013-02-23 17:23:47 -08:00
Enno Rehling
173c18d4b2 latest quicklist version, tests compile on 64-bit gcc and MSVC now 2013-02-18 22:41:40 +00:00
Enno Rehling
f60e926ec3 latest quicklist version, tests compile on 64-bit compilers 2013-02-18 14:40:37 -08:00
Enno Rehling
14f83b91e6 update configure script for multiple game directories 2013-02-18 01:41:04 +00:00
Enno Rehling
b4cea49843 copy the configure script from the arda server, it is useful 2013-02-18 01:29:15 +00:00
Enno Rehling
ccac0f824b use new 64-bit safe version of quicklist 2013-02-18 01:28:39 +00:00
Enno Rehling
82bd4391d5 ignore build directory and game output 2013-01-28 17:55:19 -08:00
Enno Rehling
eff21f8b51 write_game lives in the eressea module now 2013-01-28 17:52:44 -08:00
Enno Rehling
f19f4b3037 add an easy configuration script 
update core and cmake submodules to latest version
now using lua 5.2
now using bool where available
 2013-01-22 00:38:54 -08:00
Enno Rehling
8239c492ec update to new version of crypto library 2013-01-21 22:42:31 -08:00
Enno Rehling
3d7be88bad Working on http://bugs.eressea.de/view.php?id=1946 (WIP) 2012-10-21 19:48:40 -07:00
Enno Rehling
79feb5723c also test changing persons 2012-10-21 19:47:40 -07:00
Enno Rehling
5e58f3a881 start adding test coverage for res_changeitem 2012-10-21 18:37:51 -07:00
Enno Rehling
e378397fb4 searching for bug where owners leave castle 2012-08-03 00:52:24 -07:00
Enno Rehling
0748b98c4b fix broken laen tests by hacking in another config setting 2012-08-03 00:41:27 -07:00
Enno Rehling
cde0ce0742 fix broken laen tests by hacking in another config setting 2012-08-03 00:41:17 -07:00
Enno Rehling
d5443f88d8 laen test does not work. trying to make setresource add the raw material to fix it 2012-08-02 00:06:22 -07:00
Enno Rehling
1fe075e82d laen test does not work. trying to make setresource add the raw material to fix it 2012-08-02 00:06:03 -07:00
Enno Rehling
166d4ccc2c make the fighter in this test not die 2012-08-01 23:20:59 -07:00
Enno Rehling
65e5a82504 we can now compare regions, do not need to compare ids 2012-08-01 23:12:23 -07:00
Enno Rehling
d056f6049e fix an intermittently segfaulting test 2012-08-02 08:09:56 +02:00
Enno Rehling
94c6709e37 fix a crash caused by an old curse 2012-07-29 00:37:44 +02:00
Enno Rehling
f6b5728b49 Merge branch 'master' of github.com:eressea/core 2012-07-29 00:37:17 +02:00
Enno Rehling
dbc09d35ac fix a crash caused by an old curse 2012-07-29 00:36:42 +02:00