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

4307 Commits

Author SHA1 Message Date
Enno Rehling 5cf31189e6 remove obsolete unity build 
I used to speed up compilation by reducing the number of compilation
units with this hack. It's no longer done this way, so let me kill the
supporting files here.
 2014-02-17 11:25:53 -08:00
Enno Rehling 716b1ed498 update submodules, determine number of CPU cores. 2014-02-17 19:50:57 +01:00
Enno Rehling b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling 3db9fcf82f Rename some German symbols to English. 
I felt like I needed to make a commit today.
 2014-02-17 02:20:54 -08:00
Enno Rehling 8e611d759d eliminate intellisense warnings. 
OCD kind of stuff. Visual Studio complains about these, but they aren't
really anything severe.
 2014-02-16 13:48:07 -08:00
Enno Rehling 3e2ee057c6 Merge pull request #1 from hochl/master 
Mentoring session
 2014-02-15 19:19:29 -08:00
Thomas Troeger 59d5c1e94f added missing case for `AT_DRAIN_EXP' (bug 1514). 
added assert that triggers if a unit has no faction.
 2014-02-16 04:12:31 +01:00
Thomas Troeger 2da0d0f783 Merge branch 'master' of git://github.com/eressea/server 2014-02-16 03:25:04 +01:00
Enno Rehling 55b1a9038c fix this test to work in E2 and E3 2014-02-16 03:24:23 +01:00
Thomas Troeger c431b5cdac Merge branch 'master' of git://github.com/eressea/server 2014-02-16 03:08:03 +01:00
Enno Rehling cb23d88a2e add a test for bug 1514, proving that shadowmaster display is broken 2014-02-16 03:06:56 +01:00
Thomas Troeger 10434706f6 Merge branch 'master' of git://github.com/eressea/server 2014-02-16 00:55:17 +01:00
Enno Rehling 2e626be090 add a test to make sure that elvenhorses require riding 5 2014-02-16 00:51:43 +01:00
Thomas Troeger 0d917ae76e Merge branch 'master' of git://github.com/eressea/server 2014-02-15 23:27:16 +01:00
Enno Rehling 138e0dcc40 add a test to check that demons eat peasants 2014-02-15 23:09:18 +01:00
Enno Rehling 1594c7a71b fix a bug in the lua binding for writing a single unit 2014-02-15 23:08:48 +01:00
Enno Rehling 6ff110ae36 add a configuration option to stop peasant growths, for testing 2014-02-15 23:08:11 +01:00
Thomas Troeger cc830bb124 - added `build.lua' script published by Enno. 2014-02-07 19:35:30 +01:00
Enno Rehling 29124b92e2 Bug 1984: length of ship description is longer than a name, size buffer 
appropriately.
 2014-02-06 10:45:52 +01:00
Enno Rehling a774f882e5 fix a test that compared structs 2014-01-07 06:47:20 +01:00
Enno Rehling e0ce8877a5 increase buffer size for descriptions to 8K. http://bugs.eressea.de/view.php?id=1984 2014-01-05 19:13:06 -08:00
Enno Rehling 0f0cda214f fix http://bugs.eressea.de/view.php?id=1983 
message-type hashes were not initialized.
 2014-01-05 12:50:13 -08:00
Enno Rehling 99151e209b type conversion binds stronger than trinary operator 2014-01-04 20:15:16 +01:00
Enno Rehling 0d0b827699 make submodules refer to public URLs 2014-01-04 01:23:58 +01:00
Enno Rehling b214fc10cc Merge branch 'master' of github.com:eressea/server 2014-01-02 22:08:15 -08:00
Enno Rehling 5af91b21aa compile on VS2010, without C11 2014-01-02 22:00:52 -08:00
Enno Rehling 6412d3bbf8 remove the fallback password. 2014-01-01 20:29:08 -08:00
Enno Rehling 3660c47afb remove os.[hc] in favor of generated config.h 
new cmake files to find lua
 2014-01-01 19:14:26 +01:00
Enno Rehling 4a08cdd23e repair UTF8 order parsing 
probably broke the old latin1 parsing, but who cares?
 2013-12-31 09:27:42 -08:00
Enno Rehling 96b3e302be fix a bug reading gamedata 
n is not a loop variable, it is purely for use as a temporary here.
 2013-12-31 08:37:17 -08:00
Enno Rehling 6b5a28cd98 updated submodule 2013-12-31 10:35:16 +01:00
Enno Rehling 24000ec5a3 Merge branch 'master' of github.com:eressea/server 2013-12-31 10:29:40 +01:00
Enno Rehling 07a57fadaa fix gcc errors, mostly reading unsigned values. 2013-12-31 10:29:00 +01:00
Enno Rehling b70fd860bf add a macro o deal with unsigned int value 2013-12-31 10:25:25 +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 0e20e14bf9 updated cmake module 2013-12-30 16:43:51 +01:00
Enno Rehling 7b86db29d7 Fixing some last holdouts from the eressea->core rename. 2013-12-30 09:29:18 +01:00
Enno Rehling 30b3911637 eliminate strdup 
The POSIX name for this item is deprecated. Instead, use the ISO C++
conformant name: _strdup.
 2013-12-29 05:38:58 -08:00
Enno Rehling 4a5d2d8de9 successfully builds on win32. 
Fixed a bug in pdcurses and rearranged includes to make MOUSE_MOVED
macro and bool type not conflict with builtins.
 2013-12-29 05:12:48 -08:00
Enno Rehling 478f900b7d fixing up what my last commit broke, so it compiles on a regular linux again. 
platform.h needs some cleanup.
 2013-12-29 09:31:49 +01:00
Enno Rehling a112dc908e do not emit that MSVC warning. 
fix a missing include.
 2013-12-29 00:21:10 -08:00
Enno Rehling 6521fed160 fix some bad includes. 
start removing the cfopen function.
move a function that was only used in textstore.c.
 2013-12-29 00:19:22 -08:00
Enno Rehling 25328d2a62 fix curses compilation underncurses. 
will have to devise some other hack to fix windows
 2013-12-29 08:38:19 +01:00
Enno Rehling 47a9728db9 correct linker flags for picking visual studio runtime library. 2013-12-28 23:01:51 -08: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 78b007ff52 updated submodule to make lua work 2013-12-29 01:36:43 +01:00
Enno Rehling e3934fe675 Merge branch 'master' of github.com:eressea/server 2013-12-29 01:24:55 +01:00
Enno Rehling 9b49bbd387 fix crash in a spell when no astral space is available. 2013-12-29 00:15:50 +01:00
Enno Rehling 8c981b76cc cmake: fix path to tolua executable. 2013-12-28 15:13:22 -08:00