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

5834 Commits

Author SHA1 Message Date
Enno Rehling 465dcf4e1c bugfix sparagraph (github issue #199). 
adding tests.
 2015-05-20 18:05:25 +02:00
Enno Rehling 657c621582 if the game has no region named Muschelplateau, then ignore this code 2015-05-20 13:05:47 +02:00
Enno Rehling e8fa654a38 test processing and reports for E2 and E3 both 2015-05-20 12:42:30 +02:00
Enno Rehling 4607515e24 Merge pull request #197 from badgerman/bug-2070-negative-origin 
Bug 2070: negative origin crashes the server
 2015-05-20 11:09:08 +02:00
Enno Rehling 5af69f1821 re-enable test_peasant_luck_effect, add testing for adjust_coordinates 2015-05-20 08:15:12 +02:00
Enno Rehling 32298bd50d gcc: do not error on warnings that Visual Studio doesn't know about. 2015-05-20 07:30:59 +02:00
Enno Rehling 250880f067 fix gcc warning (unused variable) 2015-05-20 07:19:50 +02:00
Enno Rehling 455e742116 add a test for writing reports 2015-05-19 23:27:57 +02:00
Enno Rehling 7cc1cc9eda Update README.md 2015-05-19 22:45:03 +02:00
Enno Rehling b3214a1bf8 Merge pull request #196 from badgerman/develop 
bugfixes in recent refactorings: report writing, syntax errors.
 2015-05-19 19:23:18 +02:00
Enno Rehling 3a03579a65 rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
Enno Rehling e7661434e3 fix an out-of-bounds error in the new stream-based report code when centering very short headlines, refactor indentation code, add tests. 2015-05-19 08:26:44 +02:00
Enno Rehling d0f8825240 use the syntax_error function where appropriate. 
fix bug w. releasing message too soon.
 2015-05-18 11:34:52 +02:00
Enno Rehling dbf022b757 fix loop termination, sparagraph 2015-05-18 09:37:31 +02:00
Enno Rehling c6b4c51b0d fix endless loop bug. 2015-05-18 09:21:41 +02:00
Enno Rehling 72e041dd32 fix missing include 2015-05-18 09:04:05 +02:00
Enno Rehling 8e5fc28bfc refactoring more of goodies.h into strings.h 2015-05-18 08:59:38 +02:00
Enno Rehling 820cdccf32 prettier syntax: C does not require taking an address (&) of a function. 2015-05-18 08:42:35 +02:00
Enno Rehling dba1a6e221 Merge pull request #195 from badgerman/develop 
fix clang build
 2015-05-18 08:10:58 +02:00
Enno Rehling 43b2f0da9b fix -Wtautological-compare warnings from clang, again 2015-05-18 08:03:00 +02:00
Enno Rehling 8fdd779176 updated submodules 2015-05-18 07:50:51 +02:00
Enno Rehling dfa45acd68 fix -Wtautological-compare warnings from clang 2015-05-18 07:46:45 +02:00
Enno Rehling f108f08d72 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-05-18 07:38:00 +02:00
Enno Rehling 57263134ab travis build did not run the right test file 2015-05-18 07:36:39 +02:00
Enno Rehling b7826c8025 Enable rules.owners.force_leave for all running games. 
https://bugs.eressea.de/view.php?id=2059 "(TEMP?)-Einheit in feindlichem Gebäude nach Kampf"
 2015-05-18 07:28:56 +02:00
Enno Rehling 053adda3b4 Merge pull request #193 from badgerman/feature-gmtool-upgrades 
misc gmtool upgrades
 2015-05-17 17:57:46 +02:00
Enno Rehling 70eda58604 Merge branch 'develop' of github.com:eressea/server into develop 
Conflicts:
	src/CMakeLists.txt
 2015-05-17 17:52:41 +02:00
Enno Rehling 68006bdd77 Merge branch 'badgerman-lua-test-framework' into develop 2015-05-17 17:39:27 +02:00
Enno Rehling 177d1c701f Merge branch 'lua-test-framework' of https://github.com/badgerman/eressea into badgerman-lua-test-framework 
Conflicts:
	src/kernel/region.c
	src/util/log.h
 2015-05-17 17:39:10 +02:00
Enno Rehling 453d5ff21c Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-05-17 17:23:10 +02:00
Enno Rehling 9418051cd3 make gcc warn about signed/unsigned comparisons, just like Visual Studio does 2015-05-16 22:35:07 +02:00
Enno Rehling 13bccdc659 Merge pull request #191 from badgerman/feature-warn-conversion 
enable most conversion warnings on gcc < 4.9
 2015-05-15 21:13:37 +02:00
Enno Rehling c4d1482250 signed/unsigned comparisons (VC warning only) 2015-05-15 20:56:43 +02:00
Enno Rehling 9d7a9cbe6a add missing new header 2015-05-15 20:47:27 +02:00
Enno Rehling df325b243a enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +02:00
Enno Rehling dd8449783a converting float->double in a lot of the code to prevent -Wconversion messages 2015-05-15 19:08:44 +02:00
Enno Rehling b14976683d Merge pull request #190 from badgerman/feature-warn-conversion 
enable float-conversion warnings on gcc >= 4.9
 2015-05-15 18:20:46 +02:00
Enno Rehling 062237b0d1 let CMake test for gcc 4.9 before enabling -Wfloat-conversion 2015-05-15 17:15:54 +02:00
Enno Rehling eac4ef7ddc reduce conversion warning to float only 2015-05-15 13:32:22 +02:00
Enno Rehling 94f373e43a fix -Wconversion in creport.c 2015-05-15 11:20:37 +02:00
Enno Rehling c5a6f5bd03 fix -Wconversion in reports.c, json.c 2015-05-15 11:19:26 +02:00
Enno Rehling ca585de332 fix -Wconversion in battle.c 2015-05-15 08:03:10 +02:00
Enno Rehling 1dc516ab50 reduce warning level on oldterrain() log, warn from caller (json_report) instead. 2015-05-15 07:59:06 +02:00
Enno Rehling d2af6a2f88 fix -Wconversion in spells.c 2015-05-15 07:07:21 +02:00
Enno Rehling fe29e29c31 fix -Wconversion for move.c 2015-05-15 06:43:47 +02:00
Enno Rehling 72e4ee8e9f Merge pull request #188 from badgerman/develop 
fixes to Solthar's commit
 2015-05-13 20:25:10 +02:00
Enno Rehling 9c7fe1d7cc fix gcc compilation and missing argument 2015-05-13 13:12:46 +02:00
Enno Rehling 1182059b98 new submodules 2015-05-13 03:45:05 -07:00
Enno Rehling 2df0743439 Merge remote-tracking branch 'origin/develop' into develop 2015-05-13 03:18:55 -07:00
Enno Rehling a46d60aa97 enable -Wconversion on gcc/clang builds 
fix some of the warnings coming out of that for battle.c
 2015-05-13 03:17:30 -07:00