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

4758 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
8c981b76cc cmake: fix path to tolua executable. 2013-12-28 15:13:22 -08:00
Enno Rehling
0aa4272d42 suppress "unknown compiler" warning for MSVC 2013-12-26 23:30:24 -08:00
Enno Rehling
71d75b7c18 delete old visual studio files 
use cmake
 2013-12-26 21:43:03 -08:00
Enno Rehling
31b083a19f E3 hatte keine flammenschwerter 
Fixing http://bugs.eressea.de/view.php?id=1925
 2013-12-27 05:47:11 +01:00
Enno Rehling
dc28e1239f remove references to private copies of submodules 2013-12-27 03:26:32 +01:00
Enno Rehling
c070cb5df8 delete obsolete files 2013-12-27 02:15:43 +01:00
Enno Rehling
75c540992b fix the default arda server's configuration 2013-12-27 01:58:35 +01:00
Enno Rehling
bef560d92a Fix xml catalog references for E2 and E3. 
Fix a bug in the new get_arg function.
 2013-12-27 01:54:02 +01:00
Enno Rehling
ca79c28eaf kill empty folder 2013-12-27 01:07:55 +01:00
Enno Rehling
b9c27f7964 upgrade submodules to current version 2013-12-26 23:04:06 +01:00
Enno Rehling
6fe246114c import local changes from gelbbaer. 
fix argument parsing to not crash when arguments are missing.
 2013-12-26 22:57:43 +01:00
Enno Rehling
0317a2b61d begin using autoconf features in cmake 2013-05-12 14:51:54 -07:00
Enno Rehling
8e289968d0 rename eressea/ to core/ 
fix compiler flags for core
ignore linux build folder
 2013-05-11 15:06:13 -07:00
Enno Rehling
89649844f6 core is now part of the server 
simplifying git repository structure
 2013-05-11 13:02:21 -07:00
Enno Rehling
11d912aec2 remove eressea as submodule 2013-05-11 12:12:51 -07:00
Enno Rehling
63a8c10f84 split the cflags settings over more files 2013-05-04 17:29:39 -07:00
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