mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity
578 commits 10 branches 14 tags 26 MiB
Commit graph

46 commits

Author SHA1 Message Date
Mordred Admin
2113e45a5b 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
amibu
77717d29f3 Cleanup, mount DB saving; 2017-10-18 17:54:17 +02:00
amibu
e8c2fc81a5 Base for mounts, needs to be in a ActionCast; 2017-10-17 21:31:00 +02:00
amibu
9cac3a6952 Fix chat opcode + packet struct; 2017-10-17 18:33:36 +02:00
Mordred Admin
9987937934 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
amibu
e39258939b Orchestrion support 2017-10-09 20:09:49 +02:00
Maru
0b2f5c8cd1 Title list SQL work; Clean-up; 2017-10-09 00:31:31 -03:00
amibu
311a587bab Redoing everything 2017-10-06 00:13:29 +02:00
amibu
20e36d1716 Enum in Common 2017-10-05 20:40:52 +02:00
amibu
5487a2e292 Add main handling for chara gear param state; 2017-10-05 20:24:58 +02:00
Mordred
ac0a935885 Sql updates now happen on a timer per player instead of controlled by flags 2017-10-04 00:02:16 +02:00
Mordred
2d23c1e5ad Merge branch 'master' into master 2017-10-02 10:43:09 +02:00
Mordred
e6c7eeef1f Merge pull request #115 from amibu01/master 
Basic invincibility, StatusUpdate ( hp update packets ) need more investigation sending of em is situational
 2017-10-02 10:40:05 +02:00
Maru
5c23d1a6f3 Merge branch 'master' 2017-10-01 21:52:00 -03:00
Mordred
0474a6f9ce refactoring of server zone mainloop 2017-10-01 17:58:11 +02:00
Mordred
53e2a46af7 Fixed playerStateFlags being wrongfully offset by 1 bit 2017-10-01 01:42:07 +02:00
amibu
c97781e85a More stuff i forgot 2017-10-01 01:23:44 +02:00
amibu
53698cda86 Basic invincibility 2017-10-01 01:14:43 +02:00
Maru
66c5f4be45 Merge 2017-09-28 17:35:07 -03:00
Maru
0674744085 Action Collision class (AoE, filtering); Refactoring script handler; Sorted action field + aoe_width property; 2017-09-27 04:31:41 -03:00
Biscuit Boy
ac44866251 Should of Fixed Build 
Changed Opening in TerritoryIntendedUseType to OpeningArea
 2017-09-27 04:29:48 +10:00
Biscuit Boy
5ecd68e0ea Added Some TerritoryIntendedUseTypes 
Added Some Territory Intended Use Types
TODO: Add The Rest of The Territory Types and Have Better Names For Them
 2017-09-27 04:12:08 +10:00
Maru
c5ea6ec8ac AoE refactor; 2017-09-24 21:02:29 -03:00
Mordred
81025faf7e Merge pull request #102 from amibu01/master 
Remove UserLevel, handle DebugCommand permissions via internal GM rank
 2017-09-19 08:05:21 +02:00
Maru
069ab78e7e Adjustments to new definitions of action effect packet; 2017-09-19 00:42:27 -03:00
Maru
07c73b62fa Definitions for Action Effects; Further (possibly temporary) changes to AoE heal packets; 2017-09-18 23:14:43 -03:00
amibu
00d5e93e74 Remove UserLevel, handle DebugCommand permissions via internal GM rank 2017-09-18 18:44:38 +02:00
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Adam
5504156b56 Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
Maru
a2c1d9f59a Might as well refactor a bit more; 2017-09-05 00:37:22 -03:00
Maru
610e824ac0 Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; 2017-09-04 01:36:19 -03:00
Maru
be182edbfb Base raise skill; 2017-08-29 21:52:40 -03:00
Maru
3b77d239cf Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
02320755bf Merge sapphire-master 2017-08-20 12:54:54 -03:00
Mordred
f2918c378f Removed firstlogin flag, still in database though 2017-08-20 17:52:22 +02:00
Maru
13d784caff Cast interrupting; Skeleton of battle calculation stuff; 2017-08-20 02:46:06 -03:00
Mordred
6561cf566e #34 - Implemented tracking of opnening sequence, firstlogin may be obsolete now 2017-08-20 02:24:19 +02:00
Adam
98748a4100 Reimplement of CFPenaltyTime 
Reimplement a730ef3 to reflect recent refactoring.
 2017-08-19 11:28:04 +09:00
Mordred
e7712bb346 #58 - Fixed roleplaying tag not showing up 2017-08-16 22:59:53 +02:00
amibu
c92d907295 DoTs/HoTs, fixed status effects for players 2017-08-15 11:51:59 +02:00
amibu
adaf0bceba More skill scripting 2017-08-14 17:10:19 +02:00
Mordred
2fe10bda85 fixed playerstates being set incorrectly 2017-08-13 18:28:05 +02:00
Mordred Admin
3924e5450c Please use spaces instead of tabs 2017-08-09 10:30:18 +02:00
Mordred
1f10c555f8 Fixed level 0 and no weapon bug 2017-08-09 00:36:26 +02:00
amibu
cd2982a158 Fix for StatusIcons 2017-08-08 13:18:55 +02:00
Mordred Admin
e691d0504a Initial commit of the sapphire server 2017-08-08 13:53:47 +02:00