6945 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Adam	20ee459e26	instance zoning and returning implemented ... instancecontent uses instancecontent class instead of zone too	2018-01-29 13:05:33 +11:00
Adam	97e2c08a9f	fix weather in zones	2018-01-29 13:03:52 +11:00
Adam	9e830ac677	fix weather in zones	2018-01-29 13:03:52 +11:00
Mordred	bccf6e200a	Cleaning up zoneing code	2018-01-28 22:36:43 +01:00
Mordred	ad88a058c2	Cleaning up zoneing code	2018-01-28 22:36:43 +01:00
Mordred	4cf6602133	Merge pull request #226 from GokuWeedLord/event_rewrite ... instance creation/removal & debug command	2018-01-28 15:26:31 +01:00
Mordred	fb2320a742	Merge pull request #226 from GokuWeedLord/event_rewrite ... instance creation/removal & debug command	2018-01-28 15:26:31 +01:00
Adam	9d2d819e18	instance removal command	2018-01-29 00:52:11 +11:00
Adam	d1d93c9241	instance removal command	2018-01-29 00:52:11 +11:00
Adam	339a089d47	gm teri accepts instance id	2018-01-29 00:40:34 +11:00
Adam	d54f366712	gm teri accepts instance id	2018-01-29 00:40:34 +11:00
Adam	5afe002c33	Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite	2018-01-28 23:54:10 +11:00
Adam	47bcd612df	Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite	2018-01-28 23:54:10 +11:00
Adam	b05a05341c	base implementation of instance creation	2018-01-28 23:53:58 +11:00
Adam	ea47861f33	base implementation of instance creation	2018-01-28 23:53:58 +11:00
Mordred	63371153ae	forgot proper namespace for Director	2018-01-28 13:52:53 +01:00
Mordred	fa662d30b8	forgot proper namespace for Director	2018-01-28 13:52:53 +01:00
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