705 commits

Author	SHA1	Message	Date
Maru	317c37ae09	Aaah uuh fix some stuff here and there	2018-03-09 12:09:05 -03:00
Maru	5a41d3cfc2	Merge remote-tracking branch 'origin/party_crap' into party_crap	2018-03-09 09:50:55 -03:00
Maru	fefaedf03f	Apply new framework to social model	2018-03-09 09:50:35 -03:00
Maru	30cc6644cd	Merge actor_rewrite	2018-03-09 09:07:42 -03:00
Mordred Admin	250b1aef79	More framework changes, linker still unhappy	2018-03-09 10:19:38 +01:00
Mordred	83cb17610c	WiP - implementing new framework	2018-03-09 00:06:44 +01:00
Mordred	c7914a80e4	desperate try to figure out the appveyor issue	2018-03-07 17:41:16 +01:00
Mordred Admin	3d3c05fdb3	Oversight...	2018-03-07 09:22:08 +01:00
Mordred Admin	8fc9bcf564	Cleanup of script CMakeLists	2018-03-07 09:19:40 +01:00
Mordred Admin	5a6835c7f1	Disableing cotire for zone	2018-03-07 09:01:53 +01:00
Mordred Admin	8accf4cacf	forgot to remove old files	2018-03-07 08:48:16 +01:00
Mordred Admin	e15c46500c	Moved scripts out of server_zone scope	2018-03-07 08:14:42 +01:00
Mordred	42a556b487	Build fix... well ish...	2018-03-06 23:20:07 +01:00
Mordred Admin	6ed1b274a3	Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite	2018-03-06 22:24:25 +01:00
Mordred Admin	b91e711834	Cleanup of cmake files	2018-03-06 22:22:19 +01:00
Maru	ad6f25cb30	Fix const error on group gen func	2018-03-06 04:34:53 -03:00
Adam	32e10ec6e8	make mordred happy	2018-03-06 18:00:57 +11:00
Adam	df4ee95cf5	if player already zoned into instance, don't teleport them back to start on zonein	2018-03-06 14:26:35 +11:00
Maru	806f235de4	Moo woops	2018-03-05 23:55:11 -03:00
Maru	348e9916d9	Fix merge stuff	2018-03-05 23:42:09 -03:00
Adam	dcd0d6b0cd	remove double eventStart call	2018-03-06 13:34:02 +11:00
Adam	39e379747d	auto hide entrance circle	2018-03-06 13:33:10 +11:00
Maru	76ccca75a9	Merge actor_rewrite	2018-03-05 22:09:14 -03:00
Maru	63288704bb	Initializing point;	2018-03-05 22:07:41 -03:00
Mordred	ec0335b64a	Merge remote-tracking branch 'origin/master' into actor_rewrite	2018-03-06 00:10:36 +01:00
Mordred	22402651e9	Basic event play for directors, still buggy. Also some small fixes all around	2018-03-05 23:01:55 +01:00
Mordred	97ae0ac742	formatting	2018-03-05 14:35:03 +01:00
Mordred	df29f674df	formatting	2018-03-05 14:34:34 +01:00
Adam	0de9fb05cf	better handling of EventStart IPC for instances	2018-03-05 22:40:11 +11:00
Adam	8fd1a2e3df	fix onEnterTerritory events	2018-03-05 22:10:14 +11:00
Adam	2f126e8dec	build fix?	2018-03-04 18:13:05 +11:00
Adam	2c6253e37c	new instance scripts with eobj rotation	2018-03-04 17:51:32 +11:00
Adam	6255df16f2	fix rotation in objectspawn ipc and send it too	2018-03-04 17:41:17 +11:00
Mordred	619d39e6f8	Fixed an inventory bug to to invalid size	2018-03-04 00:12:33 +01:00
Maru	ce954b5d79	Merge master (framework)	2018-03-02 22:26:51 -03:00
Tahir Akhlaq	ad082ae176	fixed limsa and uldah intro quest	2018-03-02 16:27:04 +00:00
Maru	6d65274d13	Qualifiers	2018-03-02 10:18:54 -03:00
Maru	e31b3c35ef	Ｂｕｉｌｄ ｓｕｃｃｅｅｄｅｄ.	2018-03-02 10:11:03 -03:00
Maru	c93c6e24f1	Fix Travis Build	2018-03-02 09:55:03 -03:00
Maru	52468262f3	More style stuff;	2018-03-02 08:25:48 -03:00
Maru	b7f2ed462e	🗣 💩	2018-03-02 08:13:45 -03:00
Maru	2c67263135	🚮	2018-03-02 07:39:38 -03:00
Maru	a61aef2c1e	Framework; Refactors, styling, other minor stuff;	2018-03-02 07:22:25 -03:00
Maru	2f17286c77	Merging sucks sometimes you know that	2018-03-02 03:15:06 -03:00
Maru	4dd1db1dc2	Merge sapphire master	2018-03-02 02:54:09 -03:00
Adam	8437ff3cbc	set weatheroverride debug command and assert fix in spawnindexallocator	2018-03-02 15:29:48 +11:00
Mordred	78d660a1ce	Object despawning added	2018-03-01 23:17:35 +01:00
Adam	a086593eb5	Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite	2018-03-02 02:55:08 +11:00
Adam	810d71f262	move eobj/player spawnindex generation to common manager	2018-03-02 02:55:02 +11:00
Mordred	783057723e	Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite	2018-03-01 16:32:28 +01:00