685 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
goaaats	7a0d932f82	* Orchestrion + Mount SQL loading/saving	2017-12-03 17:24:11 +01:00
Mordred	1edfc8490d	Merge pull request #188 from goaaats/work ... Add definition for legacy mark equip flag, fix logout dc	2017-12-02 23:58:22 +01:00
goaaats	91b8aec97d	* Better fix for logout issue	2017-12-02 20:45:31 +01:00
goaaats	497f555eb4	* Fix logout dc	2017-12-02 17:50:08 +01:00
goaaats	dbe289385a	* Add def for legacy mark equip flag	2017-12-02 17:49:38 +01:00
Mordred Admin	1e29e66101	Qualifier removed from generated file aswell as from generator itself, once again.	2017-12-01 08:44:21 +01:00
Mordred	a42dbd7b96	Remove the right extra qualifier this time	2017-12-01 00:06:50 +01:00
Mordred	b5500d2f64	wrong change... not supposed to remove qualifier on header	2017-12-01 00:03:24 +01:00
Mordred	791a1dfb7e	we sure want linux to build this too	2017-12-01 00:01:19 +01:00
Mordred	f01eaf5710	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire	2017-11-30 23:43:39 +01:00
Mordred	6b4cc97f4d	Greatly improved exd struct gen and also updated struct test	2017-11-30 23:43:20 +01:00
Mordred	1a4667b9eb	Merge pull request #187 from ayyaruq/fix/cmake-vs2017 ... Add VS2017 generator definitions	2017-11-30 15:38:42 +01:00
Ay'yaruq Dotharl	345aa4deb1	Add VS2017 generator definitions	2017-12-01 01:02:01 +11:00
Mordred	2a3fd0ff96	Even more refactoring for cleaner code	2017-11-28 17:43:00 +01:00
Mordred	d0cb635ce3	Enforcing style rules	2017-11-28 17:29:06 +01:00
Mordred	cf29b9e80c	More code quality improvment in script manager	2017-11-28 17:22:19 +01:00
Mordred	f900bec801	Refactoring of event name generation	2017-11-28 17:16:12 +01:00
Mordred	23a32e67db	Applied template simplification to chat channel packets	2017-11-28 17:06:44 +01:00
Mordred	5f5ce9970b	refactoring various files	2017-11-28 00:09:36 +01:00
Mordred	ce9b8579a1	Merge pull request #186 from reiichi001/master ... Add a more windows-friendly SQL import script	2017-11-27 19:51:50 +01:00
Robert Baker	7352a24a07	Add a more windows-friendly SQL import script. Always runs update.sql last.	2017-11-27 09:53:20 -08:00