Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
server/res/core
History
Enno Rehling 7022ae05bd Merge branch 'master' into develop 
Conflicts:
	src/kernel/item.c
	src/modules/arena.c
2017-03-06 22:20:22 +01:00
..
armor kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
common special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
de Merge branch 'master' into develop 2017-03-06 22:20:22 +01:00
en Test E2 items in E2 only. 2017-02-27 18:50:48 +01:00
fr Test E2 items in E2 only. 2017-02-27 18:50:48 +01:00
resources remove rtype->uget funpointer, and lua callbacks. 2017-03-04 20:59:43 +01:00
spellbooks Convert all XML files to UTF-8, to allow editing with Atom. 2015-05-11 16:55:11 -07:00
weapons kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
calendar.xml fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
messages.xml eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
prefixes.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
ships.xml reqsize defaults to 1. 2016-08-06 13:53:07 +02:00
spells.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
spoils.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00