153 commits

Author	SHA1	Message	Date
Mordred	66d7dbab4f	In range containers no longer declared publicly	2018-02-11 22:57:00 +01:00
Adam	530cf8a37a	move instance objects to zone from instancecontent	2018-02-10 21:53:16 +11:00
Adam	d51c5924c5	rename objectcontrol -> objectspawn	2018-02-10 21:51:02 +11:00
Adam	bc5004598d	Merge remote-tracking branch 'upstream/develop' into instancescripting	2018-02-10 14:05:12 +11:00
Adam	32f0e30e8e	instane obj spawning	2018-02-10 14:03:59 +11:00
Mordred	2000d5d2f8	Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain	2018-02-10 01:21:31 +01:00
Adam	0c54d41304	instance objects, gameobj implementation	2018-02-10 02:47:32 +11:00
Adam	61dfd16d7b	instance scripting stuff	2018-02-09 02:34:43 +11:00
Mordred	1f40bcf91b	Merge pull request #247 from GokuWeedLord/develop ... hierachyId dump + scripts structure cleanup	2018-02-08 15:30:28 +01:00
Mordred	76dcba3f7f	comment added	2018-02-08 15:29:46 +01:00
goaaats	38661033fa	Handle via inRangeSet	2018-02-08 15:25:59 +01:00
goaaats	2383fb4321	Implement correct handling for private areas	2018-02-08 15:05:29 +01:00
Adam	bb5c97ed2f	fix instance expire time	2018-02-09 00:04:46 +11:00
Adam	6f84e9ef41	restructure script folder hierachy to remove unnecessary build targets	2018-02-08 23:28:52 +11:00
Adam	f94a8ceee5	remove exddata from sapphire_zone	2018-02-07 14:27:52 +11:00
Mordred	0cb304083d	More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value>	2018-02-07 00:00:48 +01:00
Mordred	59da08be28	Style fix	2018-02-06 00:03:08 +01:00
Mordred	0d75ba0096	Basic director handling for instances, just the bare minimum so far	2018-02-06 00:01:23 +01:00
Mordred	069127f901	Call onEnter event after zone init packet have been sent	2018-02-04 23:58:45 +01:00
Mordred	6ed0baf91f	Added events to zone for inheritance handling	2018-02-04 23:35:16 +01:00
Mordred	af90b006ac	Disabled betweenarea state flags until we fix it	2018-02-04 18:53:19 +01:00
Mordred	9cc5f9ffb3	Reconnecting during an instance now possible	2018-02-04 17:46:46 +01:00
Adam	811b4af5b1	Merge branch 'master' into master	2018-02-03 02:12:35 +11:00
Adam	6e12c74e78	add festival support	2018-02-03 02:11:29 +11:00
Mordred	d59e958d89	Pretty sure that was not supposed to be a cast	2018-02-01 23:41:27 +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
goaaats	64905308d2	Style	2018-02-01 16:28:03 +01:00
goaaats	3eb0ad0c86	Fix for weather crash	2018-02-01 14:50:51 +01:00
goaaats	c0b3d3605b	zone, api: Removed old EXD reader	2018-01-31 11:43:22 +01:00
Mordred Admin	2a6c505f9f	Merge remote-tracking branch 'origin/event_rewrite' ... Conflicts: src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp	2018-01-30 07:53:15 +01:00
Mordred	8afe739aaf	Minor cleanup of InstanceContent class	2018-01-29 19:41:41 +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	236c09fbd3	add some more mapped TerritoryIntendedUse values	2018-01-29 18:10:43 +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
Adam	97e2c08a9f	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
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	63371153ae	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	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
Adam	afd439c64f	shouts now have correct behaviour	2018-01-28 18:48:56 +11:00
Mordred	62cfa0a291	Type on comment	2018-01-28 00:03:42 +01:00
Mordred	6404951549	Removed debug code	2018-01-27 23:54:26 +01:00