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

2687 commits

Author SHA1 Message Date
SapphireMordred
dee00c8c70 Merge pull request #43 from takhlaq/portability2
mass replace data types to fixed width ones
2017-08-12 01:05:44 +02:00
Tahir Akhlaq
5ca1c3360f missed a crap from previous commit 2017-08-11 23:15:55 +01:00
Tahir Akhlaq
5136b1a397 fix lobby config, add default values for ip/port, change blowfish back to uintptr_t 2017-08-11 23:13:00 +01:00
Tahir Akhlaq
70d17607c7 mass replace data types to fixed width ones 2017-08-11 22:58:45 +01:00
SapphireMordred
cd06f5e9c6 Merge pull request #42 from takhlaq/portability
add args to rest, sql import check to travis
2017-08-11 18:05:26 +02:00
Tahir Akhlaq
abf0db012e add travis badge to readme 2017-08-11 15:18:40 +01:00
SapphireMordred
6ef3c428b5 Merge pull request #39 from amibu01/master
Fixed a PS4 related oversight
2017-08-11 13:01:38 +02:00
amibu
1b576d8b24 Fixed a PS4 oversight 2017-08-11 12:56:58 +02:00
SapphireMordred
69a327a8a9 Merge pull request #30 from itsmaru/master
Auto-attack adjustments (damage, behaviour), HP/MP/TP regen following new rules
2017-08-11 08:17:49 +02:00
Tahir Akhlaq
841820f6af lets see if it imports this time.. 2017-08-11 06:00:42 +01:00
Maru
ad300476c3 Style; 2017-08-11 01:12:55 -03:00
Maru
57bf3a0fbd HP/MP/TP Regeneration following new rules;
Bumped level cap up to 70;
Additional checks for autoattacking;
Using auto-attack damage from weapon;
2017-08-11 00:58:35 -03:00
Tahir Akhlaq
65fd18c668 added sql import script 2017-08-11 02:48:56 +01:00
Tahir Akhlaq
b041db85ec fix exception crap from previous commit 2017-08-10 23:59:31 +01:00
SapphireMordred
5e192f5b22 Merge pull request #28 from amibu01/master
Fix insta cast skills
2017-08-11 00:05:40 +02:00
Tahir Akhlaq
695e6a9157 added launch args to server_rest (needs testing) 2017-08-10 22:13:00 +01:00
amibu
594248e457 Fix insta skills 2017-08-10 22:06:05 +02:00
SapphireMordred
8c5ac5b162 Merge pull request #27 from takhlaq/travis
apparently i didnt commit this
2017-08-10 20:15:57 +02:00
Tahir Akhlaq
11fc32ee79 apparently i didnt commit this 2017-08-10 18:25:11 +01:00
SapphireMordred
6d8c088d07 Merge pull request #26 from takhlaq/travis
fix 64bit build
2017-08-10 19:00:30 +02:00
Tahir Akhlaq
d04be92bea fix 64bit build 2017-08-10 17:57:11 +01:00
SapphireMordred
a04a86774a Merge pull request #25 from amibu01/master
Sprint fix, Return implemented
2017-08-10 16:44:24 +02:00
amibu
a40f0eefe0 Return implemented 2017-08-10 16:31:48 +02:00
amibu
5c07181b13 Add more StatusEffect scripting, fix Sprint 2017-08-10 16:12:54 +02:00
amibu
f2e74458a9 StatusEffect script bindings 2017-08-10 13:56:29 +02:00
SapphireMordred
05c5734954 Merge pull request #23 from Minoost/matchmaking
Add CfMemberStatus packet definition
2017-08-10 08:33:54 +02:00
Adam
e888690812 Add eta field in CfMemberStatus 2017-08-10 15:32:10 +09:00
Adam
c52ee19469 Add CFMemberStatus packet definition 2017-08-10 11:35:05 +09:00
SapphireMordred
47773cc5fe Merge pull request #21 from takhlaq/travis
travis build crap
2017-08-10 00:41:05 +02:00
Tahir Akhlaq
e7ab2f0327 travis build crap 2017-08-09 23:38:08 +01:00
Mordred
978922c38a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-09 23:13:52 +02:00
Mordred
2b5ed15794 Fixed red circle in exp bar 2017-08-09 23:13:27 +02:00
SapphireMordred
afa18e3a6f Merge pull request #19 from amibu01/master
Chai bindings for status effects, Sprint script
2017-08-09 22:52:38 +02:00
Mordred
67a18a8253 Fixed levelup crashing the client occasionally 2017-08-09 22:50:59 +02:00
amibu
89d9e54a85 Chai bindings for status effects, Sprint script 2017-08-09 22:31:24 +02:00
SapphireMordred
0bc3116cb9 Merge pull request #18 from Minoost/matchmaking
Unlock all duty finder contents on login
2017-08-09 19:35:48 +02:00
Adam
de28fd909a Unlock all contents in duty finder for now 2017-08-10 00:41:37 +09:00
Mordred
80ac11839b Travis... why do you hate me... 2017-08-09 17:32:41 +02:00
Mordred
30d35f1bf4 ... Travis... 2017-08-09 17:30:17 +02:00
Mordred
4ecaa3703b Fair enough travis... well played... 2017-08-09 17:26:34 +02:00
Mordred
b9c684bc32 another travis test 2017-08-09 17:23:02 +02:00
Mordred
e8cdef7027 travis test 2017-08-09 17:19:06 +02:00
SapphireMordred
2d1305f73c Merge pull request #17 from Minoost/matchmaking
Add dutyreg packet definition and opcodes
2017-08-09 17:15:33 +02:00
Adam
2588a5f3ab Merge branch 'master' into matchmaking 2017-08-10 00:14:03 +09:00
SapphireMordred
65dfbd32cb Merge pull request #15 from amibu01/master
.travis.yml test and start of skill scripting
2017-08-09 16:38:24 +02:00
amibu
5e2a9927f1 Test .travis.yml 2017-08-09 16:36:19 +02:00
SapphireMordred
ba9d80d0e3 Merge pull request #14 from Minoost/master
Add SapphireLibs as a submodule
2017-08-09 16:26:54 +02:00
Adam
1ad797d583 Add libraries as a submodule 2017-08-09 23:19:14 +09:00
Adam
1a8660e322 Add dutyreg packet definition and opcodes 2017-08-09 23:15:55 +09:00
Adam
6235c834aa Merge remote-tracking branch 'upstream/master' 2017-08-09 23:14:46 +09:00