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

457 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
21a1837306 Merge remote-tracking branch 'upstream/master' 2017-09-13 11:45:03 +09:00
SapphireMordred
b10b3029f3 Merge pull request #93 from amibu01/master 
GM Ranks, some fixes
 2017-09-11 20:29:49 +02:00
amibu
ad5eae79ee Updated SQL 2017-09-11 19:06:53 +02:00
amibu
348ca42f0e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
SapphireMordred
316f53b9db Merge pull request #92 from Minoost/pathscript 
Ported dump vfs path script to 4.06
 2017-09-10 17:45:03 +02:00
SapphireMordred
e6b3123462 Merge pull request #91 from amibu01/master 
MotDs in array, full player sync after GM commands
 2017-09-10 17:44:43 +02:00
Adam
0ddc2a7bed Ported dump vfs path script to 4.06 2017-09-10 23:52:50 +09: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
SapphireMordred
ab5dd65ddb Merge pull request #90 from Minoost/master 
Add chat restricted packet def
 2017-09-10 09:55:35 +02:00
SapphireMordred
c853206729 Merge pull request #89 from amibu01/master 
Changeable World name + MotD
 2017-09-10 09:55:15 +02:00
Adam
6ffb9e90d5 Add chat restricted packet def 2017-09-10 14:02:16 +09:00
amibu
c6e208ffdf Changeable World name + MotD 2017-09-10 02:24:29 +02:00
SapphireMordred
9739b92c46 Merge pull request #88 from itsmaru/master 
New BaseStat formulas (SB, HW, ARR)
 2017-09-08 08:24:03 +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
SapphireMordred
2c6dec165b Merge pull request #87 from amibu01/master 
Make Players spawn with StatusEffects, fix news.xml, without conflicts
 2017-09-06 21:32:30 +02:00
amibu
7226d5d079 Add status table 2017-09-06 20:26:05 +02:00
amibu
1b49a53afc Make players spawn with StatusEffects 2017-09-06 20:25:58 +02:00
amibu
30d72ace1f Fix news.xml 2017-09-06 20:25:41 +02:00
SapphireMordred
c04b1c5386 Merge pull request #84 from itsmaru/master 
Definition for ActionModel and ActionAspect; Handling removing status from HUD (partial);
 2017-09-06 19:14:19 +02:00
SapphireMordred
324f11c909 Merge pull request #85 from AcedArmy/master 
Updated Sapphire Launcher HTML with New Look
 2017-09-06 08:24:16 +02:00
Biscuit Boy
f5d0264ee5 Updated Sapphire Launcher HTML with New Look 
Updated the Sapphire HTML with a New Look https://uploads.ninty.ninja/i/q8zyy.png
 2017-09-06 04:20:30 +10:00
Maru
a2c1d9f59a Might as well refactor a bit more; 2017-09-05 00:37:22 -03:00
Maru
fcbf5d81b9 🔥 Build ✔️ please 2017-09-04 06:53:04 -03:00
SapphireMordred
f41adf5e73 Merge pull request #83 from takhlaq/edit_and_continue 
updated CMakeSettings.json for edit and continue
 2017-09-04 08:15:53 +02:00
Maru
610e824ac0 Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; 2017-09-04 01:36:19 -03:00
Tahir Akhlaq
54a405f6cf updated CMakeSettings.json for edit and continue 2017-09-04 03:19:40 +01:00
Maru
b7a3ec8bdc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-09-03 13:39:22 -03:00
SapphireMordred
d3342d82af Merge pull request #82 from takhlaq/edit_and_continue 
enabled edit and continue on windows
 2017-09-03 08:31:04 +02: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 Admin
b8bf3fc8a9 updated submodule 2017-09-01 11:11:22 +02: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
SapphireMordred
29214026ae Merge pull request #80 from AcedArmy/master 
Limsa Aethernet and Update.sql Merge
 2017-08-30 16:55:47 +02:00
SapphireMordred
d75370515a fixed default values in charaiteminventory 2017-08-30 16:53:17 +02:00
Biscuit Boy
6328eb5304 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
4d01464988 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
8b694badab Added Positions for Limsa Aethernet 2017-08-30 22:59:08 +10:00
SapphireMordred
835e1846a1 Merge pull request #78 from AcedArmy/master 
Ul'dah Aethernet and setTeleporting Removed
 2017-08-30 13:44:15 +02:00
Biscuit Boy
f6fe84cb99 Added all the Positions of Ul'dah's Aethernet 2017-08-30 21:27:57 +10:00
Biscuit Boy
77098ffde3 Removed setTeleporting Function 
This should now enable teleporting from the City Aetheryte to the Aethernet
 2017-08-30 21:25:47 +10:00
SapphireMordred
3bfc518469 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
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