mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity
921 commits 10 branches 14 tags 26 MiB
Commit graph

921 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
2ff4084f4e
Removed extra qualifier 2018-01-30 14:47:27 +01:00
Mordred
9b2e9af096
Merge pull request #230 from perize/master 
Update opcode #1
 2018-01-30 13:27:08 +01:00
Perize
7b4da16e87 Correct server opcode (not verified yet) 2018-01-30 21:20:22 +09:00
Perize
e986477bdb Correct client opcode updatepos 2018-01-30 19:45:39 +09:00
Minho Kang
c4382fcd42 Merge sopcode shift posted by @Adam 2018-01-30 19:41:13 +09:00
Minho Kang
e91546c971 Fix ActionHandler 2018-01-30 19:40:42 +09:00
Mordred Admin
649ecbad53 Do not build pcb_reader by default 2018-01-30 08:04:50 +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
53b499de23 Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Mordred
0b7468ead5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +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
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
c4d80da33d Updated ReqSearchInfoHandler Location 2018-01-29 20:49:18 +11:00
Adam
1550414983 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Biscuit Boy
a588cc53c4 Updated SearchInfo Ipcs and Fixed OnlineStatus 2018-01-29 20:36:38 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
cbefc4cc1f add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
Adam
2ad9b0efaa remove isPrivate param from constructors 2018-01-29 18:10:11 +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
9e830ac677 fix weather in zones 2018-01-29 13:03:52 +11:00
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +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
Adam
d1d93c9241 instance removal command 2018-01-29 00:52:11 +11:00
Adam
d54f366712 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
47bcd612df Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite 2018-01-28 23:54:10 +11:00
Adam
ea47861f33 base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
fa662d30b8 forgot proper namespace for Director 2018-01-28 13:52:53 +01:00
Mordred
137cc944b3 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
2609a475a7 Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" 
This reverts commit 4e2319130f, reversing
changes made to 695fea7812.
 2018-01-28 11:16:34 +01:00
Mordred
9c862b2746 Updated submodule 2018-01-28 10:10:48 +01:00
Mordred
4e2319130f
Merge pull request #225 from GokuWeedLord/event_rewrite 
debug commands are now scripted, debugcommandhandler is now gone
 2018-01-28 10:07:58 +01:00
Adam
20996c17f5 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
6d5317ea1a remove debug output 2018-01-28 19:02:50 +11:00
Adam
fb06cd4930 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Adam
87a91a19ea make the output of territorymgr nicer on startup 👌 2018-01-28 18:49:29 +11:00
Adam
2ea7f776ba shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Adam
8a462c5609 scripts include ScriptObject.h sanely now 2018-01-28 14:02:51 +11:00
Mordred
695fea7812 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
0c05252c10 Linux build fix 2018-01-28 00:09:53 +01:00
Mordred
73df60440f Type on comment 2018-01-28 00:03:42 +01:00
Mordred
26062409cc updated submodule 2018-01-27 23:55:34 +01:00
Mordred
ebad3f3c2f Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Mordred
d78105f9c7
Merge pull request #224 from perize/master 
Add MSQ guide def
 2018-01-27 09:35:15 +01:00
Perize
5a3f548f86 MSQ guide packet def 2018-01-27 14:52:14 +09:00
Mordred
b4b02cf6ab
Merge pull request #223 from takhlaq/pcb_reader 
added planmap loading to pcb_reader
 2018-01-25 18:25:26 +01:00
Tahir Akhlaq
f0b888a4a3 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Mordred
4c3ed1fa7d
Merge pull request #222 from takhlaq/pcb_reader 
updated pcb_reader with mordred's eobj/enpc entries
 2018-01-24 11:26:01 +01:00