1051 commits

Author	SHA1	Message	Date
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	55525c4785	Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop	2018-02-04 17:46:59 +01:00
Mordred	9cc5f9ffb3	Reconnecting during an instance now possible	2018-02-04 17:46:46 +01:00
Adam	7644938776	cf spawns instances and zones you into them	2018-02-05 01:55:10 +11:00
Mordred	677f2521d7	Marked GCaffiliation as outdated for the time being	2018-02-04 14:16:09 +01:00
Mordred	c176c88ee2	Adjusted wrong casttime for eventactions, needs fixing in ex.json	2018-02-04 02:26:02 +01:00
Mordred	ee5196b372	Fixed state flags	2018-02-04 00:43:36 +01:00
Adam	0ee68c1b1e	fix exd_struct_gen and teleporting	2018-02-04 01:39:05 +11:00
Adam	1fc4a1676d	opcode update, cleanup and maybe disconnect issue fixed? ... it works on my machine™️	2018-02-03 19:42:42 +11:00
Adam	8a77925c30	move scripts dir to server_zone	2018-02-03 17:03:50 +11:00
Mordred	43f5894445	updaing field sizes, make sure to run update.sql	2018-02-03 02:04:00 +01:00
Mordred	95efd65e0f	Fully fixed initui and quests	2018-02-03 01:51:46 +01:00
Mordred	595a9e3079	Fixed quest tracker and gc affiliation opcodes	2018-02-02 18:34:20 +01:00
Mordred	62a14e05d1	Changed more timer usages to 64bit, changed getQuestInfo exd to grab correct field for name	2018-02-02 17:37:51 +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
Mordred	ebbe99805e	Merge pull request #234 from goaaats/exd_rework ... zone, api: Removed old EXD reader	2018-02-01 17:49:35 +01:00
Mordred	5550e6f475	Update ActionTeleport.cpp	2018-02-01 17:47:55 +01:00
goaaats	95c8d1b244	Fix cast time	2018-02-01 16:28:14 +01:00
goaaats	64905308d2	Style	2018-02-01 16:28:03 +01:00
Adam	13331c696e	fix session disconnecting issue	2018-02-02 01:22:58 +11:00
goaaats	3eb0ad0c86	Fix for weather crash	2018-02-01 14:50:51 +01:00
goaaats	413c9f1007	Style	2018-01-31 11:58:29 +01:00
goaaats	c0b3d3605b	zone, api: Removed old EXD reader	2018-01-31 11:43:22 +01:00
Adam	b3cda8ebe6	goat can finish this	2018-01-31 02:06:11 +11: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	58b2699fb9	return players to last zone if the instance doesnt exist	2018-01-29 20:41:24 +11: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	04f5823c4b	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
Adam	70cf3919d6	probably fixes linux builds	2018-01-28 19:36:03 +11:00
Adam	dde0a30fa3	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