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

341 commits

Author SHA1 Message Date
Adam
2f5497f662 Merge remote-tracking branch 'upstream/master' 2017-09-22 22:02:39 +09: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
fc60c7cec9 Blob fields can now be returned as vector. 2017-09-20 18:25:51 +02:00
Adam
cf1365a5d0 Fix indent 2017-09-19 23:33:49 +09: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
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
185c7e37ed Also adjusted item loading 2017-09-15 11:07:12 +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
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred
1495b263d9 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +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 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
amibu
b9f8b06ea7 Put MotDs into a array to send multiple 2017-09-10 16:47:40 +02:00
amibu
f2ab6ec201 Force full player sync after GM command usage 2017-09-10 16:15:48 +02:00
amibu
c6e208ffdf Changeable World name + MotD 2017-09-10 02:24:29 +02:00
Maru
1dc07c7711 Floats are cool; 2017-09-07 23:36:31 -03:00
Maru
7e1c73ae60 New BaseStat formulas (SB, HW, ARR) 2017-09-07 22:09:30 -03:00
amibu
1b49a53afc Make players spawn with StatusEffects 2017-09-06 20:25:58 +02: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
b7a3ec8bdc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-09-03 13:39:22 -03:00
Tahir Akhlaq
c7a6edc811 enabled edit and continue on windows 
- usage: tools > options > debugging > general > enable edit and continue (tick all options within its subtree)
 - attach vs to a server, edit its code, alt + f10
 2017-09-03 03:25:12 +01:00
Maru
a9e3f2fc09 Definitions for Action type and aspect; 2017-09-02 18:24:31 -03:00
Mordred
fdf3dc5dd0 Fixed teleports instantly fading out without showing any animation on finish 2017-08-30 23:08:10 +02:00
Mordred
6dd28d46a8 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
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
Maru
be182edbfb Base raise skill; 2017-08-29 21:52:40 -03:00
Maru
5897929016 Merge branch 'master' of https://github.com/itsmaru/Sapphire 2017-08-29 20:44:36 -03:00
Maru
93a7df304e Fix issue #68 (Wrong cast time info sent when multiple players are in a zone) 2017-08-29 20:28:51 -03:00
Mordred
167f0282a8 Also updated folder path in scriptmanager 2017-08-29 23:24:05 +02:00
Mordred
89f4fe6f48 Moved script folder out of bin 2017-08-29 23:22:41 +02:00
Mordred
33768e50c0 Fixed a crash when no linkshells present 2017-08-29 17:35:25 +02:00
Mordred
bf51a4d4c9 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-29 17:30:11 +02:00
Mordred Admin
2f20a8254f Build fix 2017-08-29 10:42:19 +02:00
Mordred
91155ea84b Lookup functions for linkshells 2017-08-28 23:43:52 +02:00
Mordred
cd67fe2b52 simplified linkshell loading\n removed old serverId as it is not used anymore 2017-08-28 23:19:35 +02:00