839 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Adam	0d0db3b41c	correctly remove InstanceContent zones	2018-01-29 20:40:32 +11:00
Adam	56c6b38966	createInstanceContent and some minor refactoring	2018-01-29 19:40:27 +11:00
Adam	cbefc4cc1f	add some more mapped TerritoryIntendedUse values	2018-01-29 18:10:43 +11:00
Adam	2ad9b0efaa	remove isPrivate param from constructors	2018-01-29 18:10:11 +11:00
Adam	20ee459e26	instance zoning and returning implemented ... instancecontent uses instancecontent class instead of zone too	2018-01-29 13:05:33 +11:00
Adam	9e830ac677	fix weather in zones	2018-01-29 13:03:52 +11:00
Mordred	ad88a058c2	Cleaning up zoneing code	2018-01-28 22:36:43 +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	d1d93c9241	instance removal command	2018-01-29 00:52:11 +11:00
Adam	d54f366712	gm teri accepts instance id	2018-01-29 00:40:34 +11:00
Adam	47bcd612df	Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite	2018-01-28 23:54:10 +11:00
Adam	ea47861f33	base implementation of instance creation	2018-01-28 23:53:58 +11:00
Mordred	fa662d30b8	forgot proper namespace for Director	2018-01-28 13:52:53 +01:00
Mordred	137cc944b3	Begin of InstanceContent implementation	2018-01-28 13:49:51 +01:00
Mordred	2609a475a7	Removed author comment, we have git anyways.	2018-01-28 11:40:12 +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	9c862b2746	Updated submodule	2018-01-28 10:10:48 +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	20996c17f5	probably fixes linux builds	2018-01-28 19:36:03 +11:00
Adam	6d5317ea1a	remove debug output	2018-01-28 19:02:50 +11:00
Adam	fb06cd4930	switch debugcommandhandler for scripted implementation	2018-01-28 18:52:53 +11:00
Adam	87a91a19ea	make the output of territorymgr nicer on startup 👌	2018-01-28 18:49:29 +11:00
Adam	2ea7f776ba	shouts now have correct behaviour	2018-01-28 18:48:56 +11:00
Adam	8a462c5609	scripts include ScriptObject.h sanely now	2018-01-28 14:02:51 +11:00
Mordred	695fea7812	Merge branch 'master' into event_rewrite	2018-01-28 00:30:16 +01:00
Mordred	0c05252c10	Linux build fix	2018-01-28 00:09:53 +01:00
Mordred	73df60440f	Type on comment	2018-01-28 00:03:42 +01:00
Mordred	26062409cc	updated submodule	2018-01-27 23:55:34 +01:00
Mordred	ebad3f3c2f	Removed debug code	2018-01-27 23:54:26 +01:00
Mordred	35a2c6db09	Replacement of old ZoneMgr	2018-01-27 23:52:49 +01:00
Mordred	2a1593fc4c	Merge pull request #218 from GokuWeedLord/feature/gm-debug-scripting ... update submodule and remove script name from scripts	2018-01-19 11:12:06 +01:00
Adam	6476df8ce7	update libs submodule	2018-01-19 20:30:01 +11:00
Adam	9324fe1e89	remove scriptname from scripts	2018-01-19 20:17:49 +11:00
Mordred	8890296639	More event simplification	2018-01-18 21:49:12 +01:00
Mordred	052227b85e	Merge pull request #217 from GokuWeedLord/event_rewrite ... fix hotloading setting, minor cleanup	2018-01-18 09:03:06 +01:00
Adam	59e5a3a7f1	fix hotloading setting, minor cleanup	2018-01-18 13:56:55 +11:00
Mordred	bad097f368	Merge branch 'event_rewrite' of https://github.com/SapphireMordred/Sapphire into event_rewrite	2018-01-17 23:22:23 +01:00
Mordred	3eb0997b2e	Fixed weatherrate being pulled off the wrong field	2018-01-17 23:22:19 +01:00
Mordred	8808e867a6	Merge pull request #216 from GokuWeedLord/event_rewrite ... use typeinfo for script types instead of an enum	2018-01-17 11:12:42 +01:00
Adam	1cbfccb1b3	use typeinfo for script types instead of an enum	2018-01-17 20:09:16 +11:00
Mordred	152495061f	Updated submodules	2018-01-16 19:01:10 +01:00
Mordred	4ce4a73570	Fixed mysql autoreconnect for prepared statements	2018-01-16 16:36:24 +01:00
Mordred	ea91f7e141	Small reformmating of scriptmanager	2018-01-16 16:35:50 +01:00
Mordred	f7dc992103	Simplified EventReturnHandler	2018-01-16 14:01:58 +01:00
Mordred	e7f7cc947f	More cleanup of event / script handlers	2018-01-16 02:16:48 +01:00
Mordred	2d8ea346a3	Beginning of splitting eventhandlers, pulling logic out of scriptmanager	2018-01-14 23:54:26 +01:00
Mordred Admin	f3d5bf5fa6	Simplified handling of state flags	2018-01-11 14:59:39 +01:00
Mordred Admin	5e4b4fac3e	Removed redundancy in EventHandler type declarations	2018-01-10 10:47:47 +01:00
Mordred	bafc511db2	Another approach at event improvements	2018-01-09 23:50:54 +01:00
Mordred	8d967870bd	another event rewrite approach	2018-01-09 23:44:02 +01:00