6328 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mordred	d9da17cd35	Begin of InstanceContent implementation	2018-01-28 13:49:51 +01:00
Mordred	137cc944b3	Begin of InstanceContent implementation	2018-01-28 13:49:51 +01:00
Mordred	04f5823c4b	Removed author comment, we have git anyways.	2018-01-28 11:40:12 +01:00
Mordred	2609a475a7	Removed author comment, we have git anyways.	2018-01-28 11:40:12 +01:00
Mordred	babb58fa21	Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" ... This reverts commit 6a128b1912, reversing changes made to a104b5a928.	2018-01-28 11:16:34 +01:00
Mordred	725ca11c60	Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" ... This reverts commit 4e2319130f, reversing changes made to 695fea7812.	2018-01-28 11:16:34 +01:00
Mordred	958aa0922e	Updated submodule	2018-01-28 10:10:48 +01:00
Mordred	9c862b2746	Updated submodule	2018-01-28 10:10:48 +01:00
Mordred	6a128b1912	Merge pull request #225 from GokuWeedLord/event_rewrite ... debug commands are now scripted, debugcommandhandler is now gone	2018-01-28 10:07:58 +01:00
Mordred	4e2319130f	Merge pull request #225 from GokuWeedLord/event_rewrite ... debug commands are now scripted, debugcommandhandler is now gone	2018-01-28 10:07:58 +01:00
Adam	70cf3919d6	probably fixes linux builds	2018-01-28 19:36:03 +11:00
Adam	20996c17f5	probably fixes linux builds	2018-01-28 19:36:03 +11:00
Adam	94845da821	remove debug output	2018-01-28 19:02:50 +11:00
Adam	6d5317ea1a	remove debug output	2018-01-28 19:02:50 +11:00
Adam	dde0a30fa3	switch debugcommandhandler for scripted implementation	2018-01-28 18:52:53 +11:00
Adam	fb06cd4930	switch debugcommandhandler for scripted implementation	2018-01-28 18:52:53 +11:00
Adam	99300d746a	make the output of territorymgr nicer on startup 👌	2018-01-28 18:49:29 +11:00
Adam	87a91a19ea	make the output of territorymgr nicer on startup 👌	2018-01-28 18:49:29 +11:00
Adam	afd439c64f	shouts now have correct behaviour	2018-01-28 18:48:56 +11:00
Adam	2ea7f776ba	shouts now have correct behaviour	2018-01-28 18:48:56 +11:00
Adam	3c890148f2	scripts include ScriptObject.h sanely now	2018-01-28 14:02:51 +11:00
Adam	8a462c5609	scripts include ScriptObject.h sanely now	2018-01-28 14:02:51 +11:00
Mordred	a104b5a928	Merge branch 'master' into event_rewrite	2018-01-28 00:30:16 +01:00
Mordred	695fea7812	Merge branch 'master' into event_rewrite	2018-01-28 00:30:16 +01:00
Mordred	0e34a6b107	Linux build fix	2018-01-28 00:09:53 +01:00
Mordred	0c05252c10	Linux build fix	2018-01-28 00:09:53 +01:00
Mordred	62cfa0a291	Type on comment	2018-01-28 00:03:42 +01:00
Mordred	73df60440f	Type on comment	2018-01-28 00:03:42 +01:00
Mordred	140f66a1d0	updated submodule	2018-01-27 23:55:34 +01:00
Mordred	26062409cc	updated submodule	2018-01-27 23:55:34 +01:00
Mordred	6404951549	Removed debug code	2018-01-27 23:54:26 +01:00
Mordred	ebad3f3c2f	Removed debug code	2018-01-27 23:54:26 +01:00
Mordred	aabcdf6e74	Replacement of old ZoneMgr	2018-01-27 23:52:49 +01:00
Mordred	35a2c6db09	Replacement of old ZoneMgr	2018-01-27 23:52:49 +01:00
Mordred	417d0f42a1	Merge pull request #224 from perize/master ... Add MSQ guide def	2018-01-27 09:35:15 +01:00
Mordred	d78105f9c7	Merge pull request #224 from perize/master ... Add MSQ guide def	2018-01-27 09:35:15 +01:00
Perize	2614f24a8e	MSQ guide packet def	2018-01-27 14:52:14 +09:00
Perize	5a3f548f86	MSQ guide packet def	2018-01-27 14:52:14 +09:00
Mordred	f92bdd676a	Merge pull request #223 from takhlaq/pcb_reader ... added planmap loading to pcb_reader	2018-01-25 18:25:26 +01:00
Mordred	b4b02cf6ab	Merge pull request #223 from takhlaq/pcb_reader ... added planmap loading to pcb_reader	2018-01-25 18:25:26 +01:00
Tahir Akhlaq	d575c63152	added planmap loading to pcb_reader	2018-01-24 15:34:01 +00:00
Tahir Akhlaq	f0b888a4a3	added planmap loading to pcb_reader	2018-01-24 15:34:01 +00:00
Mordred	1ce2d4af03	Merge pull request #222 from takhlaq/pcb_reader ... updated pcb_reader with mordred's eobj/enpc entries	2018-01-24 11:26:01 +01:00
Mordred	4c3ed1fa7d	Merge pull request #222 from takhlaq/pcb_reader ... updated pcb_reader with mordred's eobj/enpc entries	2018-01-24 11:26:01 +01:00
Tahir Akhlaq	b63b4eb612	updated pcb_reader with mordred's eobj/enpc entries	2018-01-24 00:15:46 +00:00
Tahir Akhlaq	95f486ef19	updated pcb_reader with mordred's eobj/enpc entries	2018-01-24 00:15:46 +00:00
Mordred	b7d0148539	Merge pull request #221 from takhlaq/pcb_reader ... reenable pcb_reader build	2018-01-23 20:30:30 +01:00
Mordred	caec894394	Merge pull request #221 from takhlaq/pcb_reader ... reenable pcb_reader build	2018-01-23 20:30:30 +01:00
Tahir Akhlaq	e01710c2c3	fix pcb_reader cmakelists i hope	2018-01-23 17:53:22 +00:00
Tahir Akhlaq	7ac18f8f5a	fix pcb_reader cmakelists i hope	2018-01-23 17:53:22 +00:00