706 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Maru	c8f2ee7305	Half work on templating SocialManager, more refactoring	2017-12-21 03:45:56 -02:00
Maru	9e152f253f	Reworking some more on group generation and flow;	2017-12-19 03:42:04 -02:00
Maru	f3e2213409	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap	2017-12-16 21:02:36 -02:00
Mordred	9c41c55092	Merge pull request #200 from takhlaq/pcb_teri ... updated pcb_reader to read territorytype from ffxivexplorer export	2017-12-11 15:53:24 +01:00
Mordred	0bb1234151	Merge pull request #198 from reiichi001/master ... Fixed import.bat to include password on import loop and update.sql imort	2017-12-11 00:06:00 +01:00
Mordred	900b65c2ae	Merge pull request #195 from perize/master ... Perform fix	2017-12-11 00:05:24 +01:00
Mordred	867227a624	Merge pull request #197 from GokuWeedLord/fix/itemlevelcalc ... fix itemlevel calculation being incorrect	2017-12-11 00:05:14 +01:00
Robert Baker	6ce2155476	Fixed import.bat to include password on import loop and update.sql import.	2017-12-10 12:59:20 -08:00
Tahir Akhlaq	6b39deed6c	updated pcb_reader to read territorytype from ffxivexplorer export	2017-12-10 14:46:30 +00:00
GokuWeedLord	552c8adfd4	fix itemlevel calc	2017-12-11 00:40:52 +11:00
Perize	351dd9792a	Use zonepacketnew instead	2017-12-09 13:55:55 +09:00
Perize	0fa3f93ce9	Fix formatting	2017-12-09 13:14:06 +09:00
Perize	62119f6ac0	Fix a perform handler	2017-12-09 13:09:56 +09:00
Maru	794fef41a3	Compile please thanks	2017-12-08 21:04:58 -02:00
Maru	fa3bc04f8e	Merge master	2017-12-08 20:55:25 -02:00
Mordred	d84d3be978	More include refactoring and space adjustments	2017-12-08 23:27:59 +01:00
Mordred	04e7f1c9cb	Minor style fixes	2017-12-08 23:09:34 +01:00
Mordred	5c13f51042	Fixed an issue with one hit kills not registering on kill events.	2017-12-08 23:05:25 +01:00
Mordred Admin	a77772bc9d	Massive chunk of refactoring. Mainly includes and namespaces	2017-12-08 15:38:25 +01:00
Mordred Admin	4d47ed478b	Greatly reduced usage of smart pointers to remove overhead from needlesly increasing reference count all the time	2017-12-08 11:46:47 +01:00
Mordred	42a2e10132	Fixed an error with accessing aetheryteList and some minor refactoring	2017-12-07 23:59:03 +01:00
Maru	f5ae374c31	Partial friend request/list coupling with social manager	2017-12-07 19:38:17 -02:00
Maru	28f2a91b21	Please compile	2017-12-07 17:50:54 -02:00
Maru	b85bc25f58	Refactor some more, work on Manager global obj;	2017-12-07 17:28:55 -02:00
Maru	5b58e5a6e2	Decouple packet handling;	2017-12-07 13:17:15 -02:00
Maru	899f0fa272	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap	2017-12-07 11:22:09 -02:00
Mordred Admin	624a872a1a	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire	2017-12-07 12:09:13 +01:00
Mordred Admin	f979793b5b	renamed sessionMap and playerSessionMap to make more sense, also fixed player object not being destructed properly	2017-12-07 12:09:08 +01:00
Mordred	2f987c4838	Merge pull request #169 from itsMaru/SQL_REWRITE_OWN ... Packet definitions; Item level; (WIP)	2017-12-07 11:48:05 +01:00
Mordred	91f6708275	Merge pull request #194 from GokuWeedLord/fix/characterdelete ... fix character quest data not being removed on character delete	2017-12-07 11:41:30 +01:00
GokuWeedLord	589a6c0728	fix character quest data not being removed on delete	2017-12-07 21:14:47 +11:00
Maru	ef06686237	Make it compile	2017-12-07 04:32:13 -02:00
Maru	cd3b2e1567	Putting things together for FriendList	2017-12-07 04:15:20 -02:00
Maru	eec2809b19	Merge branch 'party_crap' of https://github.com/takhlaq/Sapphire into party_crap	2017-12-06 21:03:27 -02:00
Maru	f7f44950cb	Decouple shared ptr (avoid potential dangling ptr), FriendList stuff	2017-12-06 18:55:57 -02:00
Maru	a8be93b5fd	Enum List Type	2017-12-06 02:46:22 -02:00
Mordred Admin	dbf4bd957b	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire	2017-12-05 14:29:36 +01:00
Mordred Admin	090001a1b5	Also should not be comitted	2017-12-05 11:43:31 +01:00
Mordred Admin	e775e6a54d	Changed settings, noone cares for local mysql accounts.;)	2017-12-05 11:41:20 +01:00
Mordred Admin	55c49b0bc4	Removed statusEffectContainer, now directly part of Actor	2017-12-05 11:21:56 +01:00
Maru	1332d580df	Insane copypaste work!11!one	2017-12-05 04:13:13 -02:00
Mordred	0eb5c4d182	Update CONTRIBUTING.md ... Fixing wrong spacing information in contributing.md	2017-12-04 15:48:46 +01:00
Maru	7504ab5ebf	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap	2017-12-04 08:01:14 -02:00
Mordred Admin	65e90edb1b	Cleanup and simplification of rest server	2017-12-04 11:00:08 +01:00
Maru	51f2ec961e	Merge	2017-12-04 07:37:58 -02:00
Mordred	d797123742	Moved new orchestrion field to update.sql	2017-12-03 23:43:45 +01:00
Mordred	49e5465017	Merge pull request #190 from goaaats/work ... SQL changes for Mounts/Orchestrion	2017-12-03 19:36:35 +01:00
goaaats	8152f67959	* Forgot SQL file	2017-12-03 19:24:54 +01:00
Mordred	0a0304d157	Merge pull request #189 from goaaats/work ... * Orchestrion + Mount SQL loading/saving	2017-12-03 18:13:21 +01:00
Mordred	aa2cfb5685	Moved rotation funciton, not inlined anymore	2017-12-03 18:11:56 +01:00