Commit graph

1391 commits

Author SHA1 Message Date
Enno Rehling
a986640ef6 json export for planes. untested. old tests broken. WIP 2014-03-22 01:56:00 -07:00
Enno Rehling
52e64ac418 this single-use macro doesn't belong there 2014-03-17 00:42:46 -07:00
Enno Rehling
1ec18b8fd9 better SWAP() macro 2014-03-17 00:28:13 -07:00
Enno Rehling
6e3ed568ea fix lua test for blessed harvest. 2014-03-17 08:21:35 +01:00
Enno Rehling
7e529f2b4c remove GM command
this was a command from the very early days, when we had player-made
quests. It is no longer in use.
2014-03-16 23:40:51 -07:00
Enno Rehling
edae097591 updated bindings 2014-03-17 04:01:52 +01:00
Enno Rehling
a32e1cd127 fix missing includes 2014-03-16 22:34:05 +01:00
Enno Rehling
632322a445 additional testing
improved directory detection in build script
2014-03-16 14:19:51 -07:00
Enno Rehling
eba61c1cda handle empty world
and add tests for it
2014-03-16 11:17:47 -07:00
Enno Rehling
e350b8a146 rebuild lua bindings
fix json export
add a script to reset submodules
2014-03-16 02:12:49 -07:00
Enno Rehling
7845de0403 json import of regions
this is terribly untested, it barely compiles.
2014-03-16 01:51:08 -07:00
Enno Rehling
3c706cf29b replace bool.h with autoconf
Most of the bool configuration was already happening there, no reason
for a separate file.
2014-03-15 22:24:18 -07:00
Enno Rehling
0ae8737062 rename MIN/MAX to _min/_max 2014-03-16 05:03:17 +01:00
Enno Rehling
70cee3c6e5 remove any dependency on stat. 2014-03-15 20:41:58 -07:00
Enno Rehling
1a4cb16ea8 fix the unused macro, remove inline functions
simplification is good
2014-03-15 20:33:43 -07:00
Enno Rehling
8e42cb8143 remove old inline cruft
fewer macros = better
2014-03-15 14:52:04 -07:00
Enno Rehling
8db8dbeefd fix usage of access()
those were the wrong constants.
2014-03-15 14:36:55 -07:00
Enno Rehling
9fc926864e Fixes for Visual C++
snprintf and strncasecmp are not that.
_access needs to be fixed on gcc, next.
2014-03-15 12:35:20 -07:00
Enno Rehling
1a7d892a96 use cmake for autoconf, slim down platform.h 2014-03-15 19:29:11 +01:00
Enno Rehling
fc1a56d46a rename export to json.
this may or may not have been a good idea, but for now, that is what I
choose.
2014-03-14 22:30:07 -07:00
Enno Rehling
7256b4c04f fix json export test
using features from new storage module version.
2014-03-13 23:59:26 -07:00
Enno Rehling
dd3de9a1d7 bindings for the json export.
+ unit test (incomplete).
2014-03-13 15:33:44 +01:00
Enno Rehling
e8b28725e1 do not run tolua inside MSVC
The cmake rules for this do not work.
2014-03-08 04:28:04 -08:00
Enno Rehling
e9bc92608c add the .pkg files so we do not need to build them. sometimes tolua is not installed. 2014-03-08 10:30:39 +01:00
Enno Rehling
e9b9c9783a export factions, too
give this a header and some flags so we can choose in detail what to
export.
2014-03-07 08:03:53 -08:00
Enno Rehling
804b8192ea Merge branch 'master' of https://github.com/eressea/server 2014-03-06 19:14:16 -08:00
Enno Rehling
528dd4b81f remove latin1 characters from some files
experimenting with .gitattributes some more
2014-03-06 19:12:12 -08:00
Enno Rehling
40d7d236ac export to a stream
can write a dict of simple regions now.
2014-03-06 08:05:26 -08:00
Enno Rehling
18203cfdbf begin writing a map exporter 2014-03-06 07:15:43 -08:00
Enno Rehling
afe355e9b9 begin creating a make install target.
add a script to set up PATHs for cmake
2014-03-02 12:20:49 -08:00
Enno Rehling
ace886a2d3 added a test for saving/loading descriptions (bug 1984).
added bindings for ship descriptions.
fixed test framework, so make test will show failures in lua.
2014-03-02 10:55:35 -08:00
Enno Rehling
bf2bb7449b move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
Enno Rehling
d9abce13a1 add lua integration tests to make test. 2014-02-18 06:08:37 +01:00
Enno Rehling
636f50e503 Merge branch 'master' of github.com:eressea/server 2014-02-18 06:05:52 +01:00
Enno Rehling
03c247c788 I am killing the core/ directory.
Lots of files are moving to a new location in src/
Some intersting CMake changes.
2014-02-18 05:45:00 +01:00
Enno Rehling
3a824eb859 Do not try to load a default lua file.
The default behavior is now that the game goes to the console without
loading setup.lua, unless setup.lua is specified in eressea.ini as the
script to be run.
Should add an option to override this from the command line, too.
2014-02-17 11:51:57 -08:00
Enno Rehling
b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling
07a57fadaa fix gcc errors, mostly reading unsigned values. 2013-12-31 10:29:00 +01:00
Enno Rehling
77ab9133c2 use the storage submodule everywhere.
make most magic use float instead of double.
2013-12-31 01:06:28 -08:00
Enno Rehling
1b88d13e75 fixing library dependencies and include paths 2013-12-31 09:05:52 +01:00
Enno Rehling
a2d6881f61 fix use of curses on windows.
workaround for curses defining its own boolean type.
2013-12-28 22:58:39 -08:00
Enno Rehling
c070cb5df8 delete obsolete files 2013-12-27 02:15:43 +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
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
63a8c10f84 split the cflags settings over more files 2013-05-04 17:29:39 -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
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
71fd2a4739 include curses in linker and include flags 2013-05-01 13:24:53 -07:00
Enno Rehling
64046250d4 confusion, merge latest changes 2013-02-23 17:27:50 -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
3d7be88bad Working on http://bugs.eressea.de/view.php?id=1946 (WIP) 2012-10-21 19:48:40 -07:00
Enno Rehling
f7edcf589a update to latest version of the eressea module
fixes for bool type
fixes for lua 5.2
fixes for some intermittent tests
2012-07-09 02:51:48 +02:00
Enno Rehling
ecc03a7f2c make e3 server work with new bindings library 2012-06-10 22:33:05 +02:00
Enno Rehling
bff66773cf update the arda server to use submodules and new cmake layout 2012-06-07 12:44:25 -07:00
Enno Rehling
10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling
4e7a758a75 making server compile with new github repository layout
todo: fix scripts and config files
2012-06-04 21:45:25 -07:00
Enno Rehling
bc8ae48cc9 Make this stuff compile on MSVC 2012-06-03 23:39:32 -07:00
Enno Rehling
8c5c6aa911 complete rewrite of cmake files 2012-06-03 18:55:52 -07:00
Enno Rehling
aa16d796f2 fix some slight compilation issues 2012-06-01 18:04:50 -07:00
Enno Rehling
09336e35e8 make tests
do not write a logfile during tests
2012-06-01 17:59:01 -07:00
Enno Rehling
889ef08189 Moving some things around in the external directory.
I am deliberately breaking the VS2010 projects with this.
I am probably breaking the Eressea server.
2012-05-30 19:17:08 -07:00
Enno Rehling
8ca04a02aa fix region owner when a building transfers 2012-05-26 10:43:37 -07:00
Enno Rehling
10ff86f34e mages have spellbooks now 2012-05-26 08:19:30 -07:00
Enno Rehling
f2598e8bdc comparisons to boolean constants are dumb. 2012-05-23 22:23:32 -07:00
Enno Rehling
f2643e79b6 fix find_spell and create_spell to only create each spell once.
kill register_spell
make some critbit changes (need to transfer them upstream)
2012-05-22 18:44:54 -07:00
Enno Rehling
e2a6bbbb72 better command line parsing
fix compilation problem
2012-05-22 14:53:46 -07:00
Enno Rehling
338a0fae4a commandline argument parsing improved. 2012-05-21 18:10:42 -07:00
Enno Rehling
8168a6c5ec new test file. this project structure needs to be redone sometime 2012-05-19 11:27:32 -07:00
Enno Rehling
07a75b6660 new gcc spouts more warnings, fix them. 2012-05-18 21:25:21 -07:00
Enno Rehling
3d50745d77 ship and building owners encapsulated in accessors 2012-05-17 15:23:44 -07:00
Enno Rehling
76ba2b9303 begin making shipowner use ship->owner. 2012-05-17 00:14:05 -07:00
Enno Rehling
1f0d5f205e rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:12 -07:00
Enno Rehling
ecac1adb1b rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:01 -07:00
Enno Rehling
3c1982da4c improve logging verbosity
adapt to changes in log module
2012-05-16 09:49:28 +02:00
Enno Rehling
5de2e790a3 I believe that these are alsways non-zero. 2012-05-15 15:02:21 -07:00
Enno Rehling
5a8a1704e7 disable and remove wisps, because they are so very, very broken. 2012-05-12 12:39:49 -07:00
Enno Rehling
ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling
c6b8f4c491 unused variables are unused 2012-05-09 18:37:31 -07:00
Enno Rehling
fda365cd84 Remove some unused variables to make gcc happy. 2012-05-10 03:34:48 +02:00
Enno Rehling
06a4a7051b combat spell functions have the same interface as spells now. 2012-05-09 18:28:03 -07:00
Enno Rehling
360f00d44f cleaning up castorder, unifying access to target region and caster. 2012-05-09 14:16:51 -07:00
Enno Rehling
4f0bdca3ba improved familiar race selection. 2012-05-09 10:42:11 -07:00
Enno Rehling
2c28ea1c41 replace spellid_t with unsigned int 2012-05-09 03:13:49 -07:00
Enno Rehling
03f74f0a47 fix a crash where wolves have not enough firce 2012-04-16 06:58:03 +02:00
Enno Rehling
3c51bc1138 Merge branch 'master' of /home/eressea/repo/eressea 2012-03-05 04:25:26 +01:00
Enno Rehling
d9a41301d4 add missing return, stop a crash 2012-03-05 04:25:23 +01:00
Enno Rehling
71d9f68b3e faction stealth is only selectively enabled in E3
do not show spell messages when no items are given (in seduce)
2012-03-04 19:24:27 -08:00
Enno Rehling
05aba860f0 http://bugs.eressea.de/view.php?id=1855
fixing delayed-action potions.
2011-06-04 11:20:04 -07:00
Enno Rehling
835f51c512 eliminate region_list usage from the monster pathfinder 2011-04-25 22:20:27 -07:00
Enno Rehling
d8abd09076 rconnect is not as nice as get_neighbours 2011-04-24 17:44:00 -07:00
Enno
b95f663087 compiling with -pedantic on linux 2011-03-08 08:42:31 +01:00
Enno Rehling
01acb1e7f6 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno
d940f29a6c indentation rules, slightly updated 2011-03-07 08:24:48 +01:00
Enno
347a888b67 indentation rules, strictly applied 2011-03-07 08:03:10 +01:00
Enno Rehling
27e435850e indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling
71988d9912 remove cvector.[hc] completely 2011-02-27 20:53:19 -08:00
Enno Rehling
7d4205a3d1 Fix carts in E3.
Store fighters in a quicklist, not a cvector.
2011-02-27 12:04:29 -08:00
Enno Rehling
1898dbe13a We have put the spoils code into the open source parts of the code. 2011-02-27 00:37:08 -08:00
Enno Rehling
9fcf31f44e Merge branch 'master' of ssh://eressea_git/home/eressea/repo/eressea 2011-02-26 00:31:31 -08:00
Enno Rehling
e8aa30c673 spell_list removal in shared code needs to be reflected in eressea. 2011-02-26 00:30:54 -08:00
Enno
e882033359 Merge branch 'master' of /home/eressea/repo/eressea 2011-02-25 16:28:51 +01:00
Enno Rehling
e3dbd71137 test alliance memberlist 2011-02-25 07:28:27 -08:00
Enno Rehling
c9f0391177 The list of alliance members is now also a quicklist, and the lua binding for faction_list iteration can disappear. 2011-02-25 07:23:02 -08:00
Enno
44e4c44a2d Merge branch 'master' of /home/eressea/repo/eressea 2011-02-24 08:27:31 +01:00
Enno Rehling
0ad43a9586 Jamfiles are history. CMake is the future and the present. 2011-02-23 23:26:58 -08:00
Enno Rehling
85d9aff2e9 Added quicklist, a linked list with better cache characteristics. 2011-02-23 22:18:58 -08:00
Enno
4a91dcdc73 Merge branch 'master' of /home/eressea/repo/eressea 2011-02-22 07:01:43 +01:00
Enno Rehling
98cdebc573 Merge branch 'master' of ssh://eressea_git/home/eressea/repo/eressea 2010-12-04 14:55:18 -08:00
Enno
1faca3cca5 fix a crash when skill does not exist 2010-10-16 22:06:27 +02:00
Enno Rehling
0837fe4176 http://bugs.eressea.de/view.php?id=1809
Monsters attacking units that they cannot see? Bad!
2010-10-10 21:42:27 -07:00
Enno Rehling
46ef7104a4 name change 2010-08-15 17:05:55 -07:00
Enno Rehling
63fdc369f0 names too long 2010-08-15 17:02:41 -07:00
Enno Rehling
280b3e53fe update vcproj for example 2010-08-15 01:40:10 -07:00
Enno Rehling
b1b3214385 add example to my solution 2010-08-15 01:27:15 -07:00
unknown
875a4a852b VS 2008 Release build 2010-08-14 19:42:15 -07:00
unknown
74eca26845 VC 2008 projects for my netbookk 2010-08-14 16:49:38 -07:00
Enno Rehling
44804c2074 undo more CRLF screwups. 2010-08-08 01:14:01 -07:00
Enno Rehling
23d127a508 this got lost in the CRLF fix somehow 2010-08-08 01:01:03 -07:00
Enno Rehling
3838538306 new repository layout. 2010-08-08 00:45:50 -07:00
Enno Rehling
c2b00b9552 use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-08 00:45:49 -07:00
Enno
0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling
f30041e24c new repository layout. 2010-08-07 23:16:20 -07:00
Enno Rehling
72d186787b use all external libraries from the external/ fodler, do not require any other installations to be presetn (VS2010)
rename server folder to shared/
2010-08-07 22:58:40 -07:00
Enno Rehling
f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno Rehling
e608d40e7a moving to a new repository layout.
step 3: the example server that anyone can use
2010-08-07 22:17:11 -07:00
unknown
239f63b945 Now with VC 2010 project files 2010-07-25 17:09:29 -07:00
Enno Rehling
0b4f92e312 fix crash when missing all spell targets 2010-07-03 13:00:37 -07:00
Enno
c03fc6b72c fix crash (but break antimagic visibility again) 2010-06-13 06:24:28 +02:00
Enno Rehling
dc8b38a4c6 http://bugs.eressea.de/view.php?id=1692
cinfo_simple shows spell-effects to other people, cinfo_unit does not.
2010-06-09 23:15:33 -07:00
Enno Rehling
0a81a6edf0 ignore some file types 2010-06-08 21:54:13 -07:00
Enno Rehling
e8a77607b4 cleanup 2010-06-08 21:46:19 -07:00
Enno Rehling
d0419db94d create some basic resources before starting to test stuff. 2010-06-08 21:26:22 -07:00
Enno Rehling
757517073d include test-suite in the server itself. 2010-06-08 21:02:54 -07:00
Enno Rehling
41cf66cee5 http://bugs.eressea.de/view.php?id=1769
- wolves should not be on a ship
2010-05-31 20:12:36 -07:00
Enno Rehling
621430b7f0 http://bugs.eressea.de/view.php?id=1743
- resist magic: do not apply power to quantity. it's already in the quality of the equation.
2010-05-31 00:13:19 -07:00
Enno Rehling
e9a53fca3f http://bugs.eressea.de/view.php?id=1731
- prevent familiars from getting new spells
- fix existing chaos
2010-03-14 16:27:27 -07:00
Enno
d71e9e796f temporary fix for a crash in sp_analyzemagic 2010-03-13 19:18:56 +01:00
Enno Rehling
275476aaf6 fixing directories and stuff. 2010-03-08 23:16:11 -08:00
Enno Rehling
e8363b41cf vcproj minus svn 2010-03-07 17:58:17 -08:00
Enno
31b8d65f1f Useful error message when locale is not set correctly 2010-03-08 01:20:20 +01:00
Enno Rehling
5c0b3a856b vcproject fixes 2010-03-06 15:51:33 -08:00
Enno Rehling
64fb51c067 more moving around 2010-03-06 14:40:26 -08:00
Enno Rehling
9f55deeea9 deleting more stuff 2010-03-06 14:36:04 -08:00
Enno Rehling
dd3f204a69 removing and moving to make a clean eressea-only repo 2010-03-06 14:32:20 -08:00
Enno Rehling
3302b8032f move E3 related scripts out of main scripts folder 2010-02-27 22:14:36 +00:00
Enno Rehling
0e47409d6b duplication 2010-02-27 21:00:57 +00:00
Enno Rehling
a17bb2b9d9 making shit compile with cmake on unix 2010-02-27 20:36:48 +00:00
Enno Rehling
c8a8c0f862 Jamfiles (Test, DNC, WIP) 2010-02-27 19:24:19 +00:00
Enno Rehling
b2fcbc529b jamfiles (WIP, DNC) 2010-02-27 19:12:53 +00:00
Enno Rehling
49bb928c23 warning do not want 2010-02-27 09:05:23 +00:00
Enno Rehling
d3c967acc3 moving monster code to eressea (to be re-done in lua some day) 2010-02-27 09:04:19 +00:00
Enno Rehling
59748ca6c3 moving monster code to eressea (to be re-done in lua some day) 2010-02-27 09:03:51 +00:00
Enno Rehling
85ed970c54 moving monsters to eressea 2010-02-27 08:28:59 +00:00
Enno Rehling
2acf165574 2010-02-26 06:35:40 +00:00
Enno Rehling
ce1d7e3c75 moving E3-related files
fixing config-e3a
2010-02-26 06:09:27 +00:00
Enno Rehling
191185f5c5 moving E3-related files 2010-02-26 05:22:04 +00:00
Enno Rehling
222d754da5 - parameter swirly
- warning level 4 is better
2010-02-25 16:46:54 +00:00
Enno Rehling
bfca1580b9 added missing project file for tests 2010-02-25 08:25:25 +00:00
Enno Rehling
6391812ee5 Eressea server:
- passes tests
- crashes in report writing (memory corruption)

added more tests.
2010-02-25 08:23:26 +00:00
Enno Rehling
c1f4b2e6ce added a simple unit testing framework (CuTest)
added unit tests for base36
added eressea-only lua bindings
fixed flying ships
2010-02-25 07:27:30 +00:00
Enno Rehling
00e34fa972 Eressea can be compiled. Don't know if it runs :-) 2010-02-24 16:53:10 +00:00
Enno Rehling
52882bd632 moving spells into eressea-only location (should this be eressea/src instead of just eressea?) 2010-02-24 16:16:23 +00:00
Enno Rehling
715ae2b8d6 moving spells into eressea-only location (should this be eressea/src instead of just eressea?) 2010-02-24 16:16:01 +00:00
Enno Rehling
9f5ee9ecea better calendar configuration 2010-02-24 06:42:00 +00:00
Enno Rehling
ce4ad01f3a moving files that are exclusive to eressea & e3 2010-02-24 02:48:39 +00:00
Enno Rehling
7b8c4a76dd cleaning 2010-02-22 07:58:59 +00:00
Enno Rehling
6492051b78 removed karma and luck 2010-02-22 07:56:05 +00:00
Enno Rehling
58c5d7135f basic config and scripts. passes a subset of tests, but I fear it lacks a lot of essentials. 2010-02-22 07:14:37 +00:00
Enno Rehling
616a57b954 rename uruk->orc for good. 2010-02-22 06:44:04 +00:00
Enno Rehling
8c9136e88b XML can use a catalog, because that makes life easier.
Fix a bunch of small stuff.
2010-02-22 04:37:00 +00:00
Enno Rehling
ce64d77be3 argument parsing
fix crash when ct_flyingship is missing
2010-02-21 21:54:33 +00:00
Enno Rehling
9511f327b5 some logging and error reporting 2010-02-21 20:47:09 +00:00
Enno Rehling
f37430e3c1 moved all initialization code out of main and made it compile. 2010-02-21 20:28:14 +00:00
Enno Rehling
d0b1f8ac77 better naming.
* init_ functions need to be run *after* xml is laoded
* register_ fucntons are run *before* xml is loaded

DNC, WIP
2010-02-21 09:19:48 +00:00
Enno Rehling
21d7e08222 big rename: eressea.c[hc] => config.[hc] 2010-02-21 08:05:27 +00:00
Enno Rehling
99178295d6 various configurations => rules 2010-02-21 08:03:17 +00:00
Enno Rehling
45fd9eb79c making eressea follow the common project structure 2010-02-21 01:41:34 +00:00
Enno Rehling
497e11f5c6 making eressea follow the common project structure 2010-02-21 01:36:41 +00:00
Enno Rehling
65c5b0a138 skeleton structure for a basic server. which isn't the eressea server, because it has different C code. because the spells are not in there. 2010-02-21 01:32:27 +00:00
Enno Rehling
8794c4ec84 lluabind. nobody uses that anymore. 2010-02-21 00:43:46 +00:00
Enno Rehling
8e0c560839 this compiles, but it's broken in a number of ways (spells) 2010-02-21 00:35:39 +00:00
Enno Rehling
7607f5e41d Merging madly with changes made only in the hg repository. DNC, WIP 2010-02-20 23:29:46 +00:00
Enno Rehling
e168415452 first changes from hg_eressea transferred 2010-02-20 18:55:42 +00:00
Enno Rehling
a7ad6adce1 fixed the unity build (somewhat)
renamed config.h -> platform.h
forced to change a lot of includes
2010-02-20 08:31:56 +00:00
Enno Rehling
773020e49a moving directories around for FOSS separation (WIP, DNC) 2010-02-20 05:46:41 +00:00
Enno Rehling
b28f8ad007 upgrayyed sqlite to 3.6.22 2010-02-20 05:42:44 +00:00
Enno Rehling
7dfadfd887 eventbus WIP 2010-02-20 03:10:22 +00:00
Enno Rehling
c8bc10dfe8 2010-02-19 23:54:42 +00:00