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

2761 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
d4a99fd45a Merge pull request #108 from Minoost/master 
Offset eorzea time
 2017-09-22 15:40:52 +02:00
Mordred
5ee34117ce Update DebugCommandHandler.cpp 2017-09-22 15:38:32 +02:00
Adam
2324dc813c Implement offseting eorzean time 
Usage:
@set eorzeatime time
 2017-09-22 22:05:07 +09:00
Adam
2f5497f662 Merge remote-tracking branch 'upstream/master' 2017-09-22 22:02:39 +09:00
Mordred
eb4f53be03 Merge pull request #107 from AcedArmy/master 
//gm teri and Debug Cleanup
 2017-09-22 12:15:52 +02:00
Mordred
1566178a1a formatting again 2017-09-22 12:06:35 +02:00
Biscuit Boy
71eecf729f Fixed Teri Placement 2017-09-22 17:15:10 +10:00
Biscuit Boy
01a82562cb Removed Debug Commands that can be used as GM Commands 
Removed the Debug Commands that have GM counterparts
 2017-09-22 17:08:12 +10:00
Biscuit Boy
4e928c3c18 Added GM Teri Command 
Added The //gm teri <ZoneID> Command (The Internal name can also be used)
 2017-09-22 17:03:25 +10:00
Mordred
7604264394 Merge pull request #106 from AcedArmy/master 
Added EXP GM Command
 2017-09-22 00:15:44 +02:00
Mordred
e1d2f4fbb1 Updated formatting to be inline with everything else. 2017-09-21 23:59:05 +02:00
Biscuit Boy
6e87892d2c Added EXP GM Command 
Added the EXP Command for GM's in the GM Packet Handler
 2017-09-22 01:12:37 +10:00
Mordred
2a9076860f Merge pull request #105 from AcedArmy/master 
Added Foundation/The Pillars Aethernet
 2017-09-21 08:23:41 +02:00
Biscuit Boy
ceb960df09 Added Foundation Aethernet 2017-09-21 15:54:06 +10:00
Mordred
284ab211a4 Linux needs memcopy from string.h 2017-09-20 18:34:38 +02:00
Mordred
676de51fb3 Removed unneeded string 2017-09-20 18:27:00 +02:00
Mordred
fc60c7cec9 Blob fields can now be returned as vector. 2017-09-20 18:25:51 +02:00
Mordred
43702776be Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-09-19 23:13:02 +02:00
Mordred
ee73eedc85 Added transactions 2017-09-19 23:12:46 +02:00
Adam
cf1365a5d0 Fix indent 2017-09-19 23:33:49 +09:00
Mordred Admin
dad2e255f5 Wrapping helpers in util namespace 2017-09-19 10:59:42 +02: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
Mordred
3eddc33256 Merge pull request #104 from takhlaq/readme 
cleaned up README and added appveyor badge
 2017-09-19 08:04:40 +02:00
Mordred
7a4aa5590c Merge pull request #103 from itsmaru/master 
Prototype AoE skill handling; Action Effect definitions and a bit of refactoring;
 2017-09-19 08:03:52 +02:00
Tahir Akhlaq
76aa95bcfa cleaned up README and added appveyor badge 2017-09-19 06:12:04 +01:00
Maru
0251ead69b Forgot a script for Medica II; 2017-09-19 00:42:28 -03: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
Mordred
1031d66522 Fix linux build, needs some love for the warnings 2017-09-19 00:20:45 +02:00
Maru
f5f8acb774 Map actions as pointers; Prototype AoE healing; 2017-09-18 19:07:41 -03:00
Mordred
1faa3c3898 First iteration of new mysql wrapper 2017-09-19 00:02:14 +02:00
amibu
00d5e93e74 Remove UserLevel, handle DebugCommand permissions via internal GM rank 2017-09-18 18:44:38 +02:00
Mordred
d12db28951 Build fix 2017-09-15 14:05:45 +02:00
Mordred
c3b5d30322 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +02:00
Mordred
0956d1eeee Merge pull request #101 from AcedArmy/master 
Added all Zonelines for Idyllshire
 2017-09-15 12:18:54 +02:00
Biscuit Boy
cd345bfce4 Added all Zonelines for Idyllshire 
Added all of the Aethernet and zoneing positions to Idyllshire
 2017-09-15 20:15:18 +10:00
Mordred
e8a6249226 Merge pull request #100 from AcedArmy/master 
Fixed the Lobby ContentID Problem
 2017-09-15 11:17:02 +02:00
Mordred
185c7e37ed Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
1b6b91490a Fixed indendation 2017-09-15 11:04:42 +02:00
Biscuit Boy
4989f37eca Fixed ContentID 
Fixed the ContentID problem, This is a fix until the new db stuff
 2017-09-15 18:43:08 +10:00
Mordred
8a63ea44bd Merge pull request #99 from itsmaru/master 
Status effect source reference; ActionCast battle log work; Cleaning compiler warnings up a bit;
 2017-09-15 07:43:35 +02:00
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred
b97162ba5d const correctness 2017-09-14 18:49:03 +02:00
Mordred
1495b263d9 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +02:00
Mordred
201a2e0623 Merge pull request #98 from amibu01/master 
Add basic server info command
 2017-09-14 17:41:37 +02:00
Mordred
40be07ac29 no qualifiers in headers 2017-09-14 17:28:24 +02:00
amibu
9453134196 Style fixes 2017-09-14 17:19:44 +02:00
amibu
a902987feb Add basic server info command 2017-09-14 17:07:58 +02:00
Mordred
970c11e503 Merge pull request #97 from razor950/master 
Added git revision support to sapphire
 2017-09-14 00:18:02 +02:00
Carlos C
d593e2b47e Add sapphire version string 
need to implement location(s) where to show git revision / version in core

server info & logs come to mind
 2017-09-13 18:06:31 -04:00