1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Commit graph

6588 commits

Author SHA1 Message Date
Mordred
c324916808 Merge pull request #119 from goaaats/master
Aetheryte -> GM command
2017-10-04 13:21:11 +02:00
Mordred
7abea43ed8 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
13b1e42d5d Indentation 2017-10-04 13:08:00 +02:00
amibu
9f691fe121 Aetheryte -> GM command 2017-10-04 11:48:58 +02:00
amibu
bced310bbd 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
7f44092a4d 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
8d6bc11dfd 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
280bd3081b 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
0500512a16 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
5e93cf116a 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
1be9d18059 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
a404b191f1 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
Mordred
f9eb41ddc7 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
08d79593a2 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
63b28c7621 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
amibu
00f6441bf1 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
Mordred
6cca2b80ad 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
amibu
76fd34a7d8 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 Admin
218882d58e 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
6f7130f437 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
8f50a444a7 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
Mordred
fb62f4ae77 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
7de2ce2fcd 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
Maru
ac752ab524 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
57a1c2e8a6 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
dda9fb2cc6 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
598d038aea refactoring of server zone mainloop 2017-10-01 17:58:11 +02:00