Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
482 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

482 Commits

Author SHA1 Message Date
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 b0fb81640b set warning level for this part of eressea especially high 2013-05-04 17:28:08 -07:00
Enno Rehling 935ba67d27 update to latest CMakelists.txt build files 2013-05-04 15:47:53 -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 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 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 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 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 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 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 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 cde0ce0742 fix broken laen tests by hacking in another config setting 2012-08-03 00:41:17 -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 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
Steffen Mecke 379e1a8f3f fix bug #1795: demon recruitment limit 2012-07-26 10:44:47 +02:00
Steffen Mecke 69a51c4b2c add message if implicit leave of building owner fails (see bug #1870) 2012-07-26 10:44:39 +02:00
Steffen Mecke f286c51862 test effect of mine (hunting bug #1926) 
test that laen is processed correctly
 2012-07-26 10:44:16 +02:00
Steffen Mecke b02f275582 fixed bug #1879: CAST should not prevent FOLLOW UNIT 2012-07-26 10:43:10 +02:00
Enno Rehling 72579b0272 Merge branch 'master' of github.com:eressea/core 2012-07-24 00:19:14 -07:00
Enno Rehling ea618453f7 bind more processing functions to Lua (almost done) 2012-07-24 00:16:25 -07:00
Enno Rehling 5abfaad528 fixing intermittent tests 2012-07-09 08:27:41 +02:00
Enno Rehling 3fda0ab144 added an option to disable storms from configuration files 2012-07-08 23:15:22 -07:00
Enno Rehling 366f0feeaa need to mark ships for fishing even if not drifting (this code is bad) 2012-07-08 19:15:06 -07:00
Enno Rehling f4761867cd Merge branch 'master' of github.com:eressea/core 2012-07-09 01:25:57 +02:00
Enno Rehling cb56a820b5 fix gcc compilation 
fix broken test for duplicate orders
 2012-07-09 01:25:39 +02:00
Enno Rehling e01a420aa8 translate travel-through message 2012-07-08 16:10:48 -07:00
Enno Rehling 9af5f08a8a translate region visibility in NR 2012-07-08 16:04:45 -07:00
Enno Rehling e7f0650e4c translate diplomatic status in the NR 2012-07-08 15:59:27 -07:00
Enno Rehling 9812a8dc34 translate spell modifiers 2012-07-08 15:40:37 -07:00