mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-30 05:07:46 +00:00
Code Activity
676 commits 10 branches 14 tags 26 MiB
Commit graph

122 commits

Author SHA1 Message Date
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
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 Admin
55c49b0bc4 Removed statusEffectContainer, now directly part of Actor 2017-12-05 11:21:56 +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
2a3fd0ff96 Even more refactoring for cleaner code 2017-11-28 17:43:00 +01:00
Mordred
5f5ce9970b refactoring various files 2017-11-28 00:09:36 +01:00
Mordred
4c71428dc2 renamed type in actors to ObjKind as thats what it is called internally, also less ambugious to modelType which i also added an enum for 2017-11-26 01:12:26 +01:00
Maru
add49a250b Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' 2017-11-24 17:11:02 -02:00
Mordred
cfc8373f5d Simplification of packet templates 2017-11-21 18:43:09 +01:00
Mordred
526be370d3
Merge pull request #175 from GokuWeedLord/feature/mounts 
fix mounting & mount persistance
 2017-11-21 17:47:19 +01:00
GokuWeedLord
a25a9027f6 fix mounting & mount persistance 2017-11-21 17:39:10 +11:00
Maru
2392f50497 Reorganize math classes; Fix crash on spawning actor; Style; 2017-11-21 03:19:08 -02:00
Mordred
3395b21dd6 Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Maru
ed23ff9a60 Fix and optimize itemlevel; IsWeapon Item Property; 2017-11-16 20:44:37 -02:00
Maru
030f5484ed Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 20:20:35 -02:00
Mordred
1d4655f750 Players wont be able to connect anymore if a session is already present 2017-11-16 23:06:33 +01:00
Maru
a1b56e525a Packet definitions; Item level (WIP); 
Packetdef for PlayerStats and PlayerClassInfo. ItemLvl currently broken and not optimized (constantly calling to calc due to equipitem).
 2017-11-16 00:03:36 -02:00
Mordred
b58acb90af Logout will now remove a playersession almost instantly 2017-11-14 23:55:38 +01:00
Maru
a1a6cc59f8 Small stuff (organizing, adding titlelist loading) 2017-11-02 17:54:10 -02:00
Mordred Admin
19decb8e39 Simplified usage of new database class 2017-10-27 14:01:50 +02:00
Mordred Admin
50c68c4468 Removed unnused includes 2017-10-27 09:06:16 +02:00
Mordred
db5cf9c45c Almost done porting... 2017-10-27 00:10:13 +02:00
Mordred Admin
7e3c03ca32 Removed reference to database where unused 2017-10-26 14:40:58 +02:00
Mordred Admin
ec72cf6836 Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 
Conflicts:
	CMakeLists.txt
	src/servers/Server_Common/Network/PacketDef/Ipcs.h
	src/servers/Server_Zone/Actor/PlayerQuest.cpp
	src/servers/Server_Zone/Actor/PlayerSql.cpp
 2017-10-25 14:49:35 +02:00
Mordred
64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2 
More static_cast
 2017-10-24 07:52:43 +02:00
Mordred
3564964a8a fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
c9a53b5d2b More static_cast 
- expand some types
- gnarly std::pair issue with short to int8_t
- getLinkshellById now uses uint32_t
 2017-10-22 20:51:25 -07:00
ShelbyZ
818f617661 Quantity treated as uint32_t at packet level 
- move tryAddItem/AddItem to uint32_t from uint16_t
 2017-10-22 18:53:58 -07:00
GokuWeedLord
c79affb137 fix a compile warning 2017-10-21 22:23:28 +11:00
ShelbyZ
279563b90f Fixing spacing issues for casts 2017-10-20 14:12:24 -07:00
ShelbyZ
a73721764f Fixing some type alignments via casting 
- static_cast for reasonable values
- at least one stray float
 2017-10-19 16:18:16 -07:00
Mordred
25b75043c5 More sql updates and conversions 2017-10-18 20:49:37 +02:00
amibu
e586a119e0 Cleanup, mount DB saving; 2017-10-18 17:54:17 +02:00
amibu
951dabb58a Formatting 2017-10-17 22:52:12 +02:00
amibu
b0a2eb853a Base for mounts, needs to be in a ActionCast; 2017-10-17 21:31:00 +02:00
Mordred
e934528f48 Fix for quest sql operations 2017-10-15 23:16:28 +02:00
Mordred
a4dfc28129 More sql updates, specifically quest and searchmessages 2017-10-15 01:43:57 +02:00
Mordred Admin
292e1e5d15 Merged most recent 4.1 fixes to SQL rewrites, new fields will have to be readded by hand 2017-10-11 10:16:25 +02:00
Mordred
22e416dabc Added basic player updates 2017-10-10 00:03:24 +02:00
amibu
779662550f A space 2017-10-09 20:20:10 +02:00
amibu
08d7246160 Add scroll item id to learnSong 2017-10-09 20:17:43 +02:00