79 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tahir Akhlaq	8488e7679f	missed a crap from previous commit	2017-08-11 23:15:55 +01:00
Tahir Akhlaq	9d87f23caf	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	82af45e561	mass replace data types to fixed width ones	2017-08-11 22:58:45 +01:00
SapphireMordred	91d9427100	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	c06874e4b4	add travis badge to readme	2017-08-11 15:18:40 +01:00
Tahir Akhlaq	ba5a385d29	lets see if it imports this time..	2017-08-11 06:00:42 +01:00
Tahir Akhlaq	d4cb82d82b	added sql import script	2017-08-11 02:48:56 +01:00
Tahir Akhlaq	85292ad051	fix exception crap from previous commit	2017-08-10 23:59:31 +01:00
Tahir Akhlaq	93763c5005	added launch args to server_rest (needs testing)	2017-08-10 22:13:00 +01:00
SapphireMordred	5af5eadf60	Merge pull request #27 from takhlaq/travis ... apparently i didnt commit this	2017-08-10 20:15:57 +02:00
Tahir Akhlaq	04105eaad4	apparently i didnt commit this	2017-08-10 18:25:11 +01:00
SapphireMordred	a05e3211fb	Merge pull request #26 from takhlaq/travis ... fix 64bit build	2017-08-10 19:00:30 +02:00
Tahir Akhlaq	23e2bb4b7b	fix 64bit build	2017-08-10 17:57:11 +01:00
SapphireMordred	3db37945f4	Merge pull request #25 from amibu01/master ... Sprint fix, Return implemented	2017-08-10 16:44:24 +02:00
amibu	32357ba812	Return implemented	2017-08-10 16:31:48 +02:00
amibu	78252ae96d	Add more StatusEffect scripting, fix Sprint	2017-08-10 16:12:54 +02:00
amibu	f4e8798fe0	StatusEffect script bindings	2017-08-10 13:56:29 +02:00
SapphireMordred	4ae193ad7f	Merge pull request #23 from Minoost/matchmaking ... Add CfMemberStatus packet definition	2017-08-10 08:33:54 +02:00
Minho Kang	42537bee46	Add eta field in CfMemberStatus	2017-08-10 15:32:10 +09:00
Minho Kang	81c13d5e8c	Add CFMemberStatus packet definition	2017-08-10 11:35:05 +09:00
SapphireMordred	882bdb9bad	Merge pull request #21 from takhlaq/travis ... travis build crap	2017-08-10 00:41:05 +02:00
Tahir Akhlaq	e79f1b9689	travis build crap	2017-08-09 23:38:08 +01:00
Mordred	d8af791d53	Merge branch 'master' of https://github.com/SapphireMordred/Sapphire	2017-08-09 23:13:52 +02:00
Mordred	fe1909b4ee	Fixed red circle in exp bar	2017-08-09 23:13:27 +02:00
SapphireMordred	568a88ac73	Merge pull request #19 from amibu01/master ... Chai bindings for status effects, Sprint script	2017-08-09 22:52:38 +02:00
Mordred	f6679f7ad0	Fixed levelup crashing the client occasionally	2017-08-09 22:50:59 +02:00
amibu	0a62578590	Chai bindings for status effects, Sprint script	2017-08-09 22:31:24 +02:00
SapphireMordred	e38c0aa1f7	Merge pull request #18 from Minoost/matchmaking ... Unlock all duty finder contents on login	2017-08-09 19:35:48 +02:00
Minho Kang	6109a191b2	Unlock all contents in duty finder for now	2017-08-10 00:41:37 +09:00
Mordred	518ba5898a	Travis... why do you hate me...	2017-08-09 17:32:41 +02:00
Mordred	983d39521e	... Travis...	2017-08-09 17:30:17 +02:00
Mordred	847910f183	Fair enough travis... well played...	2017-08-09 17:26:34 +02:00
Mordred	77da4d1b4d	another travis test	2017-08-09 17:23:02 +02:00
Mordred	ceeafa6737	travis test	2017-08-09 17:19:06 +02:00
SapphireMordred	f586640906	Merge pull request #17 from Minoost/matchmaking ... Add dutyreg packet definition and opcodes	2017-08-09 17:15:33 +02:00
Minho Kang	0914e1dbd5	Merge branch 'master' into matchmaking	2017-08-10 00:14:03 +09:00
SapphireMordred	2d0c3070da	Merge pull request #15 from amibu01/master ... .travis.yml test and start of skill scripting	2017-08-09 16:38:24 +02:00
amibu	e49dff4d4d	Test .travis.yml	2017-08-09 16:36:19 +02:00
SapphireMordred	5334367c34	Merge pull request #14 from Minoost/master ... Add SapphireLibs as a submodule	2017-08-09 16:26:54 +02:00
Minho Kang	77aec38a75	Add libraries as a submodule	2017-08-09 23:19:14 +09:00
Minho Kang	3fa66835f5	Add dutyreg packet definition and opcodes	2017-08-09 23:15:55 +09:00
Minho Kang	405d7983c1	Merge remote-tracking branch 'upstream/master'	2017-08-09 23:14:46 +09:00
amibu	78452638df	PoC Skill Scripting	2017-08-09 16:08:43 +02:00
SapphireMordred	caca1b1439	Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 ... Updated Zoneline 1317533	2017-08-09 15:28:16 +02:00
Biscuit Boy	c40c7574bb	Updated Zoneline 1317533 ... Zoneline 1317533 will no longer put you back into Old Grid	2017-08-09 23:17:15 +10:00
SapphireMordred	d6c93f7cad	Merge pull request #12 from takhlaq/editorconfig ... add editorconfig file	2017-08-09 15:09:23 +02:00
SapphireMordred	7a04724bc6	Merge pull request #11 from amibu01/master ... Chat output for ZoneLines	2017-08-09 15:04:12 +02:00
amibu	757105403a	ZoneLine chat output	2017-08-09 15:02:24 +02:00
Tahir Akhlaq	962a11ee72	add editorconfig file	2017-08-09 13:44:57 +01:00
SapphireMordred	188db87409	Merge pull request #10 from amibu01/master ... Add "@set classjob" command	2017-08-09 14:41:23 +02:00