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

5841 Commits

Author SHA1 Message Date
Enno Rehling c22636ca13 unit tests for update_long_order. e3 tests are still broken. 2015-08-05 00:03:30 +02:00
Enno Rehling 928b9966d0 fix broken test (select DESTROY over MOVE), start writing unit tests for update_long_order 2015-08-04 23:04:00 +02:00
Enno Rehling 4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling 00d8994918 Merge branch 'master' into develop 
Conflicts:
	.gitmodules
 2015-08-04 10:50:43 +02:00
Enno Rehling 57bb4a49f1 fix git submodule urls (badgerman->ennorehling) and iniparser 2015-08-04 10:25:57 +02:00
Enno Rehling 4649a0861d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/buildno.h
 2015-08-03 19:49:50 +02:00
Enno Rehling 2288b8fb27 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	src/buildno.h
	src/kernel/config.c
	src/kernel/save.c
	src/kernel/unit.c
	src/laws.c
	src/move.c
 2015-08-03 19:43:26 +02:00
Enno Rehling c19bed02fe Merge remote-tracking branch 'upstream/develop' into develop 2015-08-03 19:17:25 +02:00
Enno Rehling 6727b0cbe4 Merge pull request #261 from ennorehling/hotfix/bug-2123-gbdream-no-mage 
Hotfix 3.5.4 (against master)
 2015-08-02 23:22:28 +02:00
Enno Rehling 9938b3fb66 eliminate update_gbdream completely, make code smaller and simpler. 
simplify tests (no need to use create_spell if we don't use it)
increase build no for hotfix.
 2015-08-02 23:16:41 +02:00
Enno Rehling d99ffaf1ed filter by curse-type before trying to call update_gbdreams. 2015-08-02 22:45:59 +02:00
Enno Rehling b5ed7c562d wait until curse->magician has been resolve()'s before calling effskill() to find f->max_spelllevel. 2015-08-02 22:08:35 +02:00
Enno Rehling 17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling a119f7617f add some assertions to make sure update_gbdream is not called without a magician 2015-08-02 21:17:21 +02:00
Enno Rehling 802f8b08d6 try setting origin manually 2015-07-31 14:10:30 +02:00
Enno Rehling dbabb94632 first new unit gets five WdL 2015-07-28 10:53:48 +02:00
Enno Rehling 51fc6680dd require trees for new player regions 2015-07-28 10:51:14 +02:00
Enno Rehling d9e7ff69eb fix xml config xinclude links 2015-07-26 14:20:28 +02:00
Enno Rehling 009993f2f4 address some PVS comments 2015-07-21 09:01:11 +02:00
Enno Rehling a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script 
make the preview link use a soft-link, not calculate the build-directory again.
 2015-07-19 20:07:08 +02:00
Enno Rehling 38ecf783c2 ignore comments 2015-07-12 16:16:57 +02:00
Enno Rehling 18d82b38ea Merge branch 'feature/travis-migration' into develop 2015-07-12 15:04:57 +02:00
Enno Rehling 602f254e22 Merge branch 'develop' of github.com:eressea/server into develop 
Conflicts:
	s/build
 2015-07-12 14:43:48 +02:00
Enno Rehling dfeae86af5 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-07-12 14:43:05 +02:00
Enno Rehling ffa4a01f1c Merge branch 'ennorehling-feature/travis-migration' into develop 2015-07-12 14:42:37 +02:00
Enno Rehling 4682a4ec62 Merge branch 'feature/travis-migration' of https://github.com/ennorehling/eressea into ennorehling-feature/travis-migration 2015-07-12 14:42:01 +02:00
Enno Rehling 21a81bd307 cleanup: struct declaration, more static. 2015-07-12 14:24:46 +02:00
Enno Rehling cc263ed6c8 Merge branch 'feature/travis-migration' into develop 2015-07-12 14:18:27 +02:00
Enno Rehling f1b0488a78 missing include 2015-07-12 14:17:35 +02:00
Enno Rehling 0a57933e30 minor optimizations, error checking (static analysis) 2015-07-12 14:17:27 +02:00
Enno Rehling 3fc3660152 ignore PVS=-Studio files 2015-07-12 14:17:18 +02:00
Enno Rehling 758f4a592d minor optimizations, error checking (static analysis) 2015-07-12 14:10:33 +02:00
Enno Rehling 6ea859ecea ignore PVS=-Studio files 2015-07-12 13:15:10 +02:00
Enno Rehling c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling 7087c0e0ab Update to latest submodules, fix iniparser and critbit. 
I did this before, must have lost it in the merge. Crazy.
 2015-07-12 10:38:01 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 65b7fc7ff8 prefer clang 2015-07-12 04:49:40 +02:00
Enno Rehling 12d7862c51 Merge branch 'hotfix-3-5-3' 2015-07-12 04:48:35 +02:00
Enno Rehling 93f7c16def new iniparser 2015-07-12 04:46:53 +02:00
Enno Rehling e06352a242 iniparser master 2015-07-12 04:45:10 +02:00
Enno Rehling 11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling ae079b8a15 Merge branch 'hotfix-3.4.1' of github.com:eressea/server into hotfix-3.4.1 2015-07-12 01:41:48 +02:00
Enno Rehling a3a2e3074d uninitialized variable 2015-07-12 01:38:22 +02:00
Enno Rehling b89c9a2401 raspberry pi fixes 2015-07-12 01:04:39 +02:00
Enno Rehling 3f57431e0b new submodule rev, might fix travis? 2015-07-12 00:09:00 +02:00
Enno Rehling c6da0c2189 fix tolua, I guess 2015-07-11 23:45:59 +02:00
Enno Rehling 252d8b8d88 trying to fix tolua build 2015-07-11 23:25:09 +02:00
Enno Rehling 90d428f67a use local copy of tolua if it isn't installed in the system 2015-07-11 21:52:59 +02:00
Enno Rehling 4c79962729 add tolua submodule, kill all references to tolua++ 2015-07-11 17:48:35 +02:00