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

6588 commits

Author SHA1 Message Date
Adam
d6bf277183 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
bc66801c34 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
3d8e56ede4 update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Adam
8835c5457a update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Mordred
6bbe0385cd Removed extra qualifier 2018-01-30 14:47:27 +01:00
Mordred
2ff4084f4e
Removed extra qualifier 2018-01-30 14:47:27 +01:00
Mordred
f3d3b86dea Merge pull request #230 from perize/master
Update opcode #1
2018-01-30 13:27:08 +01:00
Mordred
9b2e9af096
Merge pull request #230 from perize/master
Update opcode #1
2018-01-30 13:27:08 +01:00
Perize
7d41839f0d Correct server opcode (not verified yet) 2018-01-30 21:20:22 +09:00
Perize
7b4da16e87 Correct server opcode (not verified yet) 2018-01-30 21:20:22 +09:00
Perize
111aa8c383 Correct client opcode updatepos 2018-01-30 19:45:39 +09:00
Perize
e986477bdb Correct client opcode updatepos 2018-01-30 19:45:39 +09:00
Adam
709e1c1b94 Merge sopcode shift posted by @Adam 2018-01-30 19:41:13 +09:00
Minho Kang
c4382fcd42 Merge sopcode shift posted by @Adam 2018-01-30 19:41:13 +09:00
Adam
e9142af286 Fix ActionHandler 2018-01-30 19:40:42 +09:00
Minho Kang
e91546c971 Fix ActionHandler 2018-01-30 19:40:42 +09:00
Mordred Admin
d63ba00094 Do not build pcb_reader by default 2018-01-30 08:04:50 +01:00
Mordred Admin
649ecbad53 Do not build pcb_reader by default 2018-01-30 08:04:50 +01:00
Mordred Admin
2a6c505f9f Merge remote-tracking branch 'origin/event_rewrite'
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
2018-01-30 07:53:15 +01:00
Mordred Admin
0fc7d293ec Merge remote-tracking branch 'origin/event_rewrite'
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
2018-01-30 07:53:15 +01:00
Mordred
8afe739aaf Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Mordred
53b499de23 Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Mordred
88f8eb2cb5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +01:00
Mordred
0b7468ead5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +01:00
Mordred
530c9f996f Merge pull request #227 from GokuWeedLord/event_rewrite
instance zoning and returning implemented
2018-01-29 11:00:58 +01:00
Mordred
003c659183
Merge pull request #227 from GokuWeedLord/event_rewrite
instance zoning and returning implemented
2018-01-29 11:00:58 +01:00
Mordred
e708fc5624 Merge pull request #228 from AcedArmy/master
Updated SearchInfo IPC's and Fixed OnlineStatus
2018-01-29 11:00:28 +01:00
Mordred
1ae00be022
Merge pull request #228 from AcedArmy/master
Updated SearchInfo IPC's and Fixed OnlineStatus
2018-01-29 11:00:28 +01:00
Biscuit Boy
b01ed63f48 Updated ReqSearchInfoHandler Location 2018-01-29 20:49:18 +11:00
Biscuit Boy
c4d80da33d Updated ReqSearchInfoHandler Location 2018-01-29 20:49:18 +11:00
Adam
58b2699fb9 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
1550414983 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
95bf84ca6d correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Biscuit Boy
82c892b022 Updated SearchInfo Ipcs and Fixed OnlineStatus 2018-01-29 20:36:38 +11:00
Biscuit Boy
a588cc53c4 Updated SearchInfo Ipcs and Fixed OnlineStatus 2018-01-29 20:36:38 +11:00
Adam
e9d0e5cbb8 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
236c09fbd3 add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
Adam
cbefc4cc1f add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
Adam
36d64630d3 remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
2ad9b0efaa remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
7de0885b54 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Adam
20ee459e26 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Adam
97e2c08a9f fix weather in zones 2018-01-29 13:03:52 +11:00
Adam
9e830ac677 fix weather in zones 2018-01-29 13:03:52 +11:00
Mordred
bccf6e200a Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Mordred
4cf6602133 Merge pull request #226 from GokuWeedLord/event_rewrite
instance creation/removal & debug command
2018-01-28 15:26:31 +01:00
Mordred
fb2320a742
Merge pull request #226 from GokuWeedLord/event_rewrite
instance creation/removal & debug command
2018-01-28 15:26:31 +01:00