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

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maru
161d24f505 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
Maru
353f2a3cd0 🔥 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
SapphireMordred
b6a20b465c 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
Maru
68e862d95b 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
Tahir Akhlaq
10e7dee216 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
Maru
a8ce37b419 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
SapphireMordred
0889564230 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
Tahir Akhlaq
0ecf2bd962 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
Maru
2d15367c7d 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 Admin
f52010469d 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
0eeeb020eb 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
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
29214026ae Merge pull request #80 from AcedArmy/master 
Limsa Aethernet and Update.sql Merge
 2017-08-30 16:55:47 +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
d75370515a fixed default values in charaiteminventory 2017-08-30 16:53:17 +02:00
SapphireMordred
e18813a027 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
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
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
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
8b694badab Added Positions for Limsa Aethernet 2017-08-30 22:59:08 +10:00
Biscuit Boy
624cd1c67b 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
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
f6fe84cb99 Added all the Positions of Ul'dah's Aethernet 2017-08-30 21:27:57 +10:00
Biscuit Boy
513b75b81f 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
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
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
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
6f4cf03b4b Style; 2017-08-30 01:53:46 -03:00
Maru
9edb75394a 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
34568b6431 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
5010aed6b3 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
be9482c11f 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