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

224 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
0eeeb020eb Fixed teleports instantly fading out without showing any animation on finish 2017-08-30 23:08:10 +02:00
Mordred
a6ee31eb11 Fixed teleport interruption wrongfully showing animation.\n Fixed Teleport interruption not resetting casting state. \n Changed GLOBAL keyword in chai to global 2017-08-30 18:45:34 +02:00
SapphireMordred
8ba20cd99c Merge pull request #80 from AcedArmy/master 
Limsa Aethernet and Update.sql Merge
 2017-08-30 16:55:47 +02:00
SapphireMordred
e18813a027 fixed default values in charaiteminventory 2017-08-30 16:53:17 +02:00
Biscuit Boy
3811923071 Update.sql Merged into other SQL's 
Merged the Update.sql into the other SQL's
 2017-08-30 23:44:22 +10:00
Biscuit Boy
b48d2009e2 Made it so update.sql no longer runs 
Commented out all of update.sql's code Just it case it needs to be ran for some reason again
 2017-08-30 23:35:25 +10:00
Biscuit Boy
624cd1c67b Added Positions for Limsa Aethernet 2017-08-30 22:59:08 +10:00
SapphireMordred
9479205d64 Merge pull request #78 from AcedArmy/master 
Ul'dah Aethernet and setTeleporting Removed
 2017-08-30 13:44:15 +02:00
Biscuit Boy
513b75b81f Added all the Positions of Ul'dah's Aethernet 2017-08-30 21:27:57 +10:00
Biscuit Boy
d06fc29c37 Removed setTeleporting Function 
This should now enable teleporting from the City Aetheryte to the Aethernet
 2017-08-30 21:25:47 +10:00
SapphireMordred
9146e0515d Merge pull request #77 from itsmaru/master 
Fix build; Fix issue #68; Base raise handling; Sorting out action casting stuff;
 2017-08-30 10:07:22 +02:00
Maru
9edb75394a Style; 2017-08-30 01:53:46 -03:00
Maru
34568b6431 Sorting out action effects (castbar, anim); Block heal and damage on dead actors; 2017-08-30 01:52:20 -03:00
Maru
5010aed6b3 Base raise skill; 2017-08-29 21:52:40 -03:00
Maru
be9482c11f Merge branch 'master' of https://github.com/itsmaru/Sapphire 2017-08-29 20:44:36 -03:00
Maru
2779d00c6b Fix issue #68 (Wrong cast time info sent when multiple players are in a zone) 2017-08-29 20:28:51 -03:00
Mordred
f7c8f98042 Also updated folder path in scriptmanager 2017-08-29 23:24:05 +02:00
Mordred
3a93509476 Moved script folder out of bin 2017-08-29 23:22:41 +02:00
Mordred
8a0396eac3 Fixed a crash when no linkshells present 2017-08-29 17:35:25 +02:00
Mordred
cd433904de Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-29 17:30:11 +02:00
SapphireMordred
582cc4ce52 Removed serverId from config 2017-08-29 12:06:13 +02:00
Mordred Admin
93c5348e09 Build fix 2017-08-29 10:42:19 +02:00
Mordred
b62e0bee51 Lookup functions for linkshells 2017-08-28 23:43:52 +02:00
Mordred
fbf6a84a61 simplified linkshell loading\n removed old serverId as it is not used anymore 2017-08-28 23:19:35 +02:00
Maru
1237e34e2e Fixed building on newer GCC 2017-08-28 16:13:23 -03:00
Mordred
758635f87c Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-28 18:36:55 +02:00
Mordred
613c85e841 Created linkshellMgr class and added basic linkshell caching 2017-08-28 18:36:51 +02:00
SapphireMordred
dba6d0cae2 Merge pull request #76 from Minoost/build-cmake 
Exclude script directory from ignoring
 2017-08-28 18:30:12 +02:00
Minho Kang
0baa41fa4f Exclude script directory from ignoring 2017-08-29 00:34:20 +09:00
SapphireMordred
7ae09e287e Merge pull request #75 from AcedArmy/master 
Added Aetheryte Teleports to all HW Zones
 2017-08-28 14:29:14 +02:00
Biscuit Boy
442ac8d968 Added Aetheryte Teleports to all HW Zones 2017-08-28 22:20:48 +10:00
SapphireMordred
55c6682e9b Merge pull request #74 from AcedArmy/master 
Added Aetheryte Teleports to all SB Zones
 2017-08-28 14:03:05 +02:00
Biscuit Boy
a975b8ce98 Added Aetheryte Teleports to all SB Zones 2017-08-28 21:54:04 +10:00
SapphireMordred
070c42cc95 Merge pull request #73 from AcedArmy/master 
Added Zonelines for Pillars to Foundation and visa versa
 2017-08-28 12:51:57 +02:00
Biscuit Boy
3a87d9a396 Hope I fixed my little Not Create Tables 2017-08-28 20:44:10 +10:00
Biscuit Boy
f110f021ff Added Zonelines for Pillars to Foundation and visa versa 
Added Zonelines for Pillars and Foundation, Teleporting to foundation now works, Net only needs to be done
 2017-08-28 20:32:08 +10:00
SapphireMordred
3ffcf491a9 Merge pull request #72 from Minoost/build-cmake 
Add Boost_COMPILER flag to CMakeSettings for VS
 2017-08-27 09:21:26 +02:00
Minho Kang
e577a7c385 Add Boost_COMPILER flag to CMakeSettings for VS 2017-08-27 14:13:57 +09:00
Mordred
d3652436fa Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-27 02:04:27 +02:00
Mordred
c9c86dacef Added a linkshell representation class 2017-08-27 02:04:04 +02:00
Mordred
ebd11f1a7c Added packet for linkshell events 2017-08-27 02:03:27 +02:00
SapphireMordred
ee219ba628 Merge pull request #71 from Minoost/tcp-handling 
Initial attemp to check packet boundary
 2017-08-26 09:00:28 +02:00
Minho Kang
bd76111a69 Fix string header 2017-08-26 15:42:30 +09:00
Minho Kang
39e4b9e093 Include memcpy and realloc header 2017-08-26 15:29:57 +09:00
Minho Kang
19e321e18c Merge remote-tracking branch 'upstream/master' into tcp-handling 2017-08-26 15:09:01 +09:00
Minho Kang
989c1b0854 Tempoary bound check for GamePacket 2017-08-26 15:07:40 +09:00
Minho Kang
35c42c1f23 Replace UtilNetwork with GamePacketParser 2017-08-26 15:06:27 +09:00
Mordred
b8fc46d7cb #67 Fixed tell being shown with wrong name 2017-08-25 15:34:26 +02:00
Mordred
148ba5d09f Prperational work for linkshells 2017-08-23 23:58:14 +02:00
Mordred
b83ddf9f89 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-23 17:40:08 +02:00