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

53 commits

Author SHA1 Message Date
Mordred Admin
491cdcd59a Removed reference to database where unused 2017-10-26 14:40:58 +02:00
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
Mordred
73286e24ca fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
3b42b1df9b Fixing some type alignments via casting 
- static_cast for reasonable values
- at least one stray float
 2017-10-19 16:18:16 -07:00
amibu
77717d29f3 Cleanup, mount DB saving; 2017-10-18 17:54:17 +02:00
amibu
dfde3ed820 Formatting 2017-10-17 22:52:12 +02:00
amibu
e8c2fc81a5 Base for mounts, needs to be in a ActionCast; 2017-10-17 21:31:00 +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
332b9bf2e1 Add scroll item id to learnSong 2017-10-09 20:17:43 +02:00
amibu
e39258939b Orchestrion support 2017-10-09 20:09:49 +02:00
Mordred
48309f33a9 Update Player.cpp 2017-10-09 14:13:23 +02:00
Maru
902cb69908 Handle title on player spawn; 2017-10-09 02:06:31 -03:00
Maru
13ecfe9906 Player title SQL; Handle set player title; 2017-10-09 01:56:47 -03:00
Maru
0b2f5c8cd1 Title list SQL work; Clean-up; 2017-10-09 00:31:31 -03:00
amibu
b3c5820e35 Stuff I forgot 2017-10-06 00:22:08 +02:00
amibu
311a587bab Redoing everything 2017-10-06 00:13:29 +02:00
amibu
5487a2e292 Add main handling for chara gear param state; 2017-10-05 20:24:58 +02:00
Maru
893e78d16b Bigger than expected; 2017-10-04 23:30:45 -03:00
Maru
6dece1af8c Player title prototype; 2017-10-04 23:19:38 -03: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
amibu
fc578eb0c3 Force model change debug command 2017-10-02 16:00:26 +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
69a7076e36 Some refactoring and TODO tags 2017-10-01 18:38:58 +02:00
amibu
53698cda86 Basic invincibility 2017-10-01 01:14:43 +02: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
Maru
c5ea6ec8ac AoE refactor; 2017-09-24 21:02:29 -03:00
Adam
2324dc813c Implement offseting eorzean time 
Usage:
@set eorzeatime time
 2017-09-22 22:05:07 +09: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
Maru
f5f8acb774 Map actions as pointers; Prototype AoE healing; 2017-09-18 19:07:41 -03:00
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred Admin
924a4b3973 Majorly simplified and improved the cmake setup. 
Going forward it will be alot easier to maintain.

TODO: simplify path definitions

Conflicts:
	src/servers/Server_Lobby/CMakeLists.txt
	src/servers/Server_REST/CMakeLists.txt
	src/servers/Server_Zone/CMakeLists.txt
 2017-09-13 11:46:17 +02:00
amibu
348ca42f0e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
Maru
610e824ac0 Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; 2017-09-04 01:36:19 -03:00
Mordred
fdf3dc5dd0 Fixed teleports instantly fading out without showing any animation on finish 2017-08-30 23:08:10 +02:00
Maru
6f4cf03b4b Style; 2017-08-30 01:53:46 -03:00
Maru
302b50d8b3 Sorting out action effects (castbar, anim); Block heal and damage on dead actors; 2017-08-30 01:52:20 -03:00
Mordred
a1fb3bd419 Error message now displayed properly when /tell ing unknown char 2017-08-23 17:39:59 +02:00
Mordred
d6711a0119 Added new debug command to inject into chat connection\n Added base code for tell conversations, error messages not working yet 2017-08-22 23:53:20 +02:00
Maru
1b6b7abfd2 CalcBattle stuff; 2017-08-20 19:20:37 -03:00
Maru
dcb0578d03 Merge sapphire-master 2017-08-20 17:43:07 -03:00
Mordred
cbe00da5f8 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02: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
Maru
f87261b1bb Weapon Damage property; Auto-attack for magical weapons; 2017-08-19 16:50:50 -03:00