1422 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
amibu	337c45d000	PoC Skill Scripting	2017-08-09 16:08:43 +02:00
SapphireMordred	b2d07cc175	Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 ... Updated Zoneline 1317533	2017-08-09 15:28:16 +02:00
Biscuit Boy	d382b4d113	Updated Zoneline 1317533 ... Zoneline 1317533 will no longer put you back into Old Grid	2017-08-09 23:17:15 +10:00
SapphireMordred	fc4a2c5062	Merge pull request #12 from takhlaq/editorconfig ... add editorconfig file	2017-08-09 15:09:23 +02:00
SapphireMordred	bd6a32781b	Merge pull request #11 from amibu01/master ... Chat output for ZoneLines	2017-08-09 15:04:12 +02:00
amibu	e6c9c959f2	ZoneLine chat output	2017-08-09 15:02:24 +02:00
Tahir Akhlaq	da93ea0de2	add editorconfig file	2017-08-09 13:44:57 +01:00
SapphireMordred	2881fd43ed	Merge pull request #10 from amibu01/master ... Add "@set classjob" command	2017-08-09 14:41:23 +02:00
amibu	eeee74d523	Add "@set classjob" command	2017-08-09 14:38:46 +02:00
Mordred Admin	3924e5450c	Please use spaces instead of tabs	2017-08-09 10:30:18 +02:00
SapphireMordred	b00aadf19e	Merge pull request #9 from zynjec/master ... Standardize log location	2017-08-09 00:38:30 +02:00
Mordred	1f10c555f8	Fixed level 0 and no weapon bug	2017-08-09 00:36:26 +02:00
Zynjec	7bc9873ed4	Standardize log location ... Updated REST and Zone server to use log folder.	2017-08-08 18:35:31 -04:00
SapphireMordred	5ccba7ce61	Merge pull request #7 from amibu01/master ... Added PoC PS4 Support back	2017-08-08 22:50:47 +02:00
amibu	e943187d10	PS4 insert html	2017-08-08 22:56:48 +02:00