1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Commit graph

1194 commits

Author SHA1 Message Date
Maru
1c4392cc0a Basic title list handling; 2017-10-06 20:40:27 -03:00
Mordred
abee95112a Merge pull request #124 from goaaats/master
More fixes for bad sessions/incorrectly loaded players
2017-10-06 14:56:05 +02:00
amibu
36a10bb841 Let's not break master 2017-10-06 12:59:21 +02:00
amibu
5bb4b8ba72 More fixes for bad sessions/incorrectly loaded players 2017-10-06 12:54:03 +02:00
Mordred
93d2156549 Merge pull request #123 from goaaats/master
Gear params
2017-10-06 10:09:22 +02:00
amibu
b3c5820e35 Stuff I forgot 2017-10-06 00:22:08 +02:00
amibu
311a587bab Redoing everything 2017-10-06 00:13:29 +02:00
Mordred
4a9eeb6eff updated submodules# 2017-10-05 22:44:14 +02:00
Mordred
32605544bb converted more sql queries to new system 2017-10-05 22:43:15 +02:00
amibu
20e36d1716 Enum in Common 2017-10-05 20:40:52 +02:00
amibu
5487a2e292 Add main handling for chara gear param state; 2017-10-05 20:24:58 +02:00
Mordred
4fed5b76ba Merge pull request #121 from itsMaru/master
Player title prototype; Fix a few small issues;
2017-10-05 08:13:23 +02:00
Maru
893e78d16b Bigger than expected; 2017-10-04 23:30:45 -03:00
Maru
6dece1af8c Player title prototype; 2017-10-04 23:19:38 -03:00
Maru
961390ab62 Fix issue with aggro when mob dies instantly from skill; Align cast interrupt packet with retail; 2017-10-04 22:50:11 -03:00
Maru
a4c19198d5 Fix crash when spamming cast action and cast interrupt (esc) while walking (null deref); 2017-10-04 22:04:42 -03:00
Maru
f701f6bd0a Fix wrong hPCurr/hPMax on PlayerSpawn; 2017-10-04 21:16:10 -03:00
Mordred
3d3c6e6c85 Updated submodules 2017-10-04 23:29:41 +02:00
Mordred
8cf1dcd1ee Player loading moved over to new DB system 2017-10-04 23:28:38 +02:00
Maru
1aeebebde7 Ugh 2017-10-04 16:47:28 -03:00
Maru
c53fc16ead State in player spawn reflects actual player state; 2017-10-04 16:13:11 -03:00
Mordred
c324916808 Merge pull request #119 from goaaats/master
Aetheryte -> GM command
2017-10-04 13:21:11 +02:00
amibu
843d80d928 Indentation 2017-10-04 13:08:00 +02:00
amibu
9f691fe121 Aetheryte -> GM command 2017-10-04 11:48:58 +02:00
Mordred
ac0a935885 Sql updates now happen on a timer per player instead of controlled by flags 2017-10-04 00:02:16 +02:00
Mordred
8cdb70cf31 Merged master to SQL_REWRITE_OWN 2017-10-03 23:03:58 +02:00
Mordred
a4bb966a8c Startup banner extracted to own function 2017-10-03 12:09:51 +02:00
Mordred
9a9030d206 However a windows.h include got in there... 2017-10-03 12:06:12 +02:00
Mordred
1dd52944cb simplified cmakelist 2017-10-03 11:55:21 +02:00
Mordred
53f9705048 Added a generator for enums based on data in the exds 2017-10-03 11:51:38 +02:00
Mordred
734672e8c7 Fixed eventActions not having cast bars 2017-10-02 16:59:56 +02:00
Mordred
5fd05b8cd6 Merge pull request #118 from amibu01/master
Fixing Actor ID in Cast packets(mistakenly Action ID before), force model change debug commands
2017-10-02 16:59:28 +02:00
amibu
1877974f7b Parameters were bad 2017-10-02 16:02:28 +02:00
amibu
fc578eb0c3 Force model change debug command 2017-10-02 16:00:26 +02:00
amibu
0887bbec92 Fixing Actor ID in Cast packet 2017-10-02 16:00:12 +02:00
Mordred
84cc2fc73f Merge pull request #117 from amibu01/master
No Scroll Bars for Login/Create User
2017-10-02 13:59:30 +02:00
amibu
0112ea3cf1 No Scroll Bars 2017-10-02 13:56:04 +02:00
Mordred Admin
348f057578 Fixed a linux compile error 2017-10-02 11:11:43 +02:00
Mordred
3eed7acddb Merge pull request #116 from itsmaru/master
Action Collision class (AoE); More definitions; General cleaning;
2017-10-02 11:02:39 +02:00
Mordred
2d23c1e5ad Merge branch 'master' into master 2017-10-02 10:43:09 +02:00
Mordred
e6c7eeef1f Merge pull request #115 from amibu01/master
Basic invincibility, StatusUpdate ( hp update packets ) need more investigation sending of em is situational
2017-10-02 10:40:05 +02:00
Maru
5c23d1a6f3 Merge branch 'master' 2017-10-01 21:52:00 -03:00
Maru
15e1c32f8b ActionCollision implementation work; More definitions for actionInfo; Fix compiler warnings; 2017-10-01 21:50:09 -03:00
Mordred
62837b83ae More refactoring, clean up 2017-10-01 18:43:18 +02:00
Mordred
69a7076e36 Some refactoring and TODO tags 2017-10-01 18:38:58 +02:00
Mordred
0474a6f9ce refactoring of server zone mainloop 2017-10-01 17:58:11 +02:00
Mordred
53e2a46af7 Fixed playerStateFlags being wrongfully offset by 1 bit 2017-10-01 01:42:07 +02:00
amibu
c97781e85a More stuff i forgot 2017-10-01 01:23:44 +02:00
amibu
69348f553b Style fixes 2017-10-01 01:20:36 +02:00
amibu
d463319baf Forgot a comment 2017-10-01 01:19:41 +02:00