47 commits

Author	SHA1	Message	Date
Mordred	ea46624148	Fixed !instance cr, it now takes contentfindercondition ids as input though	2018-09-19 23:04:23 +02:00
Mordred Admin	238ea28d75	Merge develop into bnpc	2018-09-17 14:04:40 +02:00
Mordred	9624d08b4c	Working towards getting bnpcs back in the game	2018-09-09 23:56:22 +02:00
NotAdam	0946b0636e	allow for multiple festivals to run at once	2018-09-01 20:55:28 +10:00
Mordred	e745bd0329	Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details	2018-08-29 21:40:59 +02:00
AriAvery	7cef56e111	less hosuing	2018-07-16 17:58:42 +02:00
AriAvery	774fa1dd7b	removed hosuing - created housing	2018-07-16 17:51:17 +02:00
AriAvery	9051ce6f11	added wardMaxNum	2018-07-16 13:54:03 +02:00
AriAvery	7ef913ad19	fixed style #2	2018-07-16 12:05:51 +02:00
AriAvery	57e1ed8503	fixed style	2018-07-16 11:58:25 +02:00
AriAvery	3593b374ff	init housing setup	2018-07-15 23:59:15 +02:00
Biscuit Boy	af06875e93	Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap	2018-07-01 21:36:35 +10:00
Biscuit Boy	7daba847a6	Now erase zone from the set and removed count like talked about	2018-04-22 01:13:37 +10:00
Biscuit Boy	3c65d76114	Fixed making new zones	2018-04-22 00:49:32 +10:00
Adam	1771ed14b4	proper festival handling (woah)	2018-03-20 20:30:05 +11:00
Mordred	fcc27defef	Improved handling of actors in zones generally	2018-03-17 18:06:13 +01:00
Adam	0d3b4431e8	make cf choose a random instance, fix territorymgr spawning event instances	2018-03-16 21:40:59 +11:00
Mordred Admin	f825eb5bdb	More framework changes, linker still unhappy	2018-03-09 10:19:38 +01:00
Mordred Admin	c2165e5f33	Cleanup of cmake files	2018-03-06 22:22:19 +01:00
Mordred	0833bdd76c	Merge remote-tracking branch 'origin/master' into actor_rewrite	2018-03-06 00:10:36 +01:00
Maru	77c044cd9d	🗣 💩	2018-03-02 08:13:45 -03:00
Maru	b3318f14a3	Framework; Refactors, styling, other minor stuff;	2018-03-02 07:22:25 -03:00
Mordred Admin	72e8fa36e8	Rearranged includes for potential speed increases	2018-02-28 10:26:03 +01:00
Adam	1235ce264b	more opcodes	2018-02-25 15:16:42 +11:00
Mordred	0a177c3470	EventObjects are not properly spawned and initialized	2018-02-23 23:47:21 +01:00
Mordred Admin	df61b53d1a	Cleaned up generated exd stuff	2018-02-14 12:31:47 +01:00
Mordred	2000d5d2f8	Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain	2018-02-10 01:21:31 +01:00
goaaats	2383fb4321	Implement correct handling for private areas	2018-02-08 15:05:29 +01:00
Adam	f94a8ceee5	remove exddata from sapphire_zone	2018-02-07 14:27:52 +11:00
Mordred	6ed0baf91f	Added events to zone for inheritance handling	2018-02-04 23:35:16 +01:00
Mordred	9cc5f9ffb3	Reconnecting during an instance now possible	2018-02-04 17:46:46 +01:00
Mordred	9b8df412f3	Fixed zone updates being extremly slow, fixed crash with wrong item reward field, fixed wrong casttime for eventAction	2018-02-01 23:32:59 +01:00
Mordred	88f8eb2cb5	Use InstanceContent name instead of placeName for InstanceContent	2018-01-29 19:35:57 +01:00
Adam	95bf84ca6d	correctly remove InstanceContent zones	2018-01-29 20:40:32 +11:00
Adam	e9d0e5cbb8	createInstanceContent and some minor refactoring	2018-01-29 19:40:27 +11:00
Adam	36d64630d3	remove isPrivate param from constructors	2018-01-29 18:10:11 +11:00
Adam	7de0885b54	instance zoning and returning implemented ... instancecontent uses instancecontent class instead of zone too	2018-01-29 13:05:33 +11:00
Mordred	bccf6e200a	Cleaning up zoneing code	2018-01-28 22:36:43 +01:00
Adam	9d2d819e18	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	5afe002c33	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
Mordred	d9da17cd35	Begin of InstanceContent implementation	2018-01-28 13:49:51 +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
Adam	99300d746a	make the output of territorymgr nicer on startup 👌	2018-01-28 18:49:29 +11:00
Mordred	6404951549	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