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

7610 Commits

Author SHA1 Message Date
Enno Rehling f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling ac4e32a8f5 Merge branch 'master' into develop 2016-10-23 09:59:42 +02:00
Enno Rehling bca90d2076 buildno.h is gone, don't try to read it. 2016-10-23 09:42:43 +02:00
Enno Rehling 34a6dd8d54 fix crash in 997: re-introduce cfindhash. 
this prevents duplicate curse.no values.
 2016-10-22 22:35:10 +02:00
Enno Rehling c7ede945b3 use site packages on Travis CI, revert to Lua 5.1 2016-10-17 19:59:06 +02:00
Enno Rehling 641c1e1979 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-17 15:50:02 +02:00
Enno Rehling f0fdb8d1a5 issue #594: temporary fix 2016-10-16 18:15:14 +02:00
Enno Rehling f697e06d17 do not use tolua from package 2016-10-16 18:07:45 +02:00
Enno Rehling edbfe686e7 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-16 17:31:05 +02:00
Enno Rehling 680c873844 Merge remote-tracking branch 'upstream/develop' into develop 2016-10-16 17:28:31 +02:00
Enno Rehling 06bfd2df5f Merge remote-tracking branch 'eressea/develop' into develop 2016-10-16 16:48:53 +02:00
Enno Rehling 919001fae0 do not rmdir tolua, we need it 2016-10-16 16:41:08 +02:00
Enno Rehling 0de30cd376 remove discontinued submodules if they are checked out 2016-10-16 11:58:42 +02:00
Enno Rehling 75422e1ba6 fix gcc conversion warnings 2016-10-09 10:07:05 +02:00
Enno Rehling bf8d3b57b3 Merge branch 'develop' of github.com:eressea/server into develop 2016-10-09 10:01:36 +02:00
Enno Rehling 3d191b6573 not likely to get fixed 2016-10-09 10:01:31 +02:00
Enno Rehling 9287d0c1b4 unused function 2016-10-07 22:06:47 +02:00
Enno Rehling 38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling fb470b7af1 re-organize lighthouse reporting. 2016-10-05 20:36:01 +02:00
Enno Rehling 5fe0503cd8 remove the unicode.h include from files that don't use it. 2016-10-05 16:43:14 +02:00
Enno Rehling f9486b6c13 Merge pull request #592 from ennorehling/develop 
smaller optimizations
 2016-10-05 12:31:33 +02:00
Enno Rehling f65bd3b079 disable logging of passwords. yikes 2016-10-05 09:28:23 +02:00
Enno Rehling e79b36bc36 introduced a memory leak i last commit 2016-10-04 10:51:37 +02:00
Enno Rehling 61f76e6722 make old_race a little bit less awful. 2016-10-04 10:34:18 +02:00
Enno Rehling 9704002d2c Merge pull request #591 from ennorehling/develop 
minor optimizations
 2016-10-04 09:20:04 +02:00
Enno Rehling 3338f00fcb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-04 09:15:11 +02:00
Enno Rehling d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling 63f60a2465 cache some more get_race calls, especially for RC_SPELL. 2016-10-03 20:36:46 +02:00
Enno Rehling 8f1a1fc8c3 tighten up some lookups. 2016-10-03 20:27:36 +02:00
Enno Rehling fbdf845cb9 fix overpopulation-checks and movement based on splitsize. 2016-10-03 20:15:38 +02:00
Enno Rehling 26a416c5ba do not call can_survive all this much. 2016-10-03 16:38:17 +02:00
Enno Rehling ef43aaa830 eliminate some duplicate calculations. 2016-10-03 16:28:18 +02:00
Enno Rehling 42e75007c3 little bit of refactoring and better variable names. 2016-10-03 16:26:40 +02:00
Enno Rehling f6beda43f4 fix small typo 2016-10-03 16:16:17 +02:00
Enno Rehling 720b42b3c4 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-02 14:32:31 +02:00
Enno Rehling 879d791a60 seems like I forgot to commit this change, 
which is making the test fail. why only on my mac, though?
 2016-10-02 14:30:27 +02:00
Enno Rehling 1fe178f2ca Merge pull request #590 from ennorehling/develop 
Bug 2242: codepage conversion creates endless loop
 2016-10-02 13:23:32 +02:00
Enno Rehling fadf591a32 gcc appeasement (overflow in constant conversion). 2016-10-02 13:19:39 +02:00
Enno Rehling 693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00
Enno Rehling 8728fccaec fix an endless loop in unicode_utf8_to_cp437 for characters not in the table. 2016-10-02 12:46:07 +02:00
Enno Rehling 165bd6acaf Merge pull request #589 from ennorehling/develop 
Bug 2239: create snowman with full hitpoints
 2016-10-02 12:03:00 +02:00
Enno Rehling 23b9774495 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-02 11:42:49 +02:00
Enno Rehling 5a129f8bd4 Create the snowman with full hitpoints. 
https://bugs.eressea.de/view.php?id=2239
 2016-10-02 11:42:31 +02:00
Enno Rehling 2bf018d518 Merge pull request #588 from ennorehling/develop 
remove RS_FARVISION, it is the only spell that uses units.
 2016-10-01 21:27:19 +02:00
Enno Rehling c53ac9d8aa remove RS_FARVISION, it is the only spell that uses units. 2016-10-01 21:03:16 +02:00
Enno Rehling 7238e4d81c Merge pull request #587 from ennorehling/develop 
Bug 2240: Tippfehler Steinkreis
 2016-10-01 19:04:10 +02:00
Enno Rehling 530e47efae Tippfehler bei Steinkreis-Weihung. 
https://bugs.eressea.de/view.php?id=2240
 2016-10-01 16:59:19 +00:00
Enno Rehling 59d145c4b5 Merge pull request #13 from eressea/develop 
update my fork
 2016-10-01 18:48:15 +02:00
Enno Rehling a8a7f68112 Merge pull request #586 from ennorehling/bug-2234-maintenance-msg 
Bug 2234: building maintenance messages
 2016-10-01 18:43:16 +02:00
Enno Rehling c640fb4be8 compile in the absence of libxml2-dev 2016-10-01 16:39:35 +00:00