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

53 commits

Author SHA1 Message Date
Mordred
e2220b0685 Fixed exd to work with generated data, also fixed generator ( boost leftovers ) 2018-11-23 21:16:02 +01:00
NotAdam
07fce83b60 Store instance guid in db when zoning into an instance 2018-11-23 16:48:40 +11:00
mordred
8456067730 Create lookup for housing zones by landsetId, load housing zone from stored territoryId in player 2018-11-06 11:11:07 +01:00
Mordred
5ffb8fd65e Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
Mordred
0f6ac74f15 Houseing data initializing and signs 2018-11-04 23:47:10 +01:00
NotAdam
4e3edbbcd2 remove more boost 2018-10-25 12:44:51 +11:00
Mordred
f7d2bb813a Fixed !instance cr, it now takes contentfindercondition ids as input though 2018-09-19 23:04:23 +02:00
Mordred Admin
150ce725bc Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
NotAdam
d88efbf30d allow for multiple festivals to run at once 2018-09-01 20:55:28 +10:00
Mordred
89a9b16555 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
AriAvery
3158df44a7 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
28d6c8fe61 removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
e4aeaaae8b added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
627a816f6e fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
d31a33732c fixed style 2018-07-16 11:58:25 +02:00
AriAvery
9aeba7a0b3 init housing setup 2018-07-15 23:59:15 +02:00
Biscuit Boy
7ee18f713f Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap 2018-07-01 21:36:35 +10:00
Biscuit Boy
c38ab3a445 Now erase zone from the set and removed count like talked about 2018-04-22 01:13:37 +10:00
Biscuit Boy
333ec303bd Fixed making new zones 2018-04-22 00:49:32 +10:00
Adam
d7006574ac proper festival handling (woah) 2018-03-20 20:30:05 +11:00
Mordred
c4ec162f0f Improved handling of actors in zones generally 2018-03-17 18:06:13 +01:00
Adam
39df53f7d0 make cf choose a random instance, fix territorymgr spawning event instances 2018-03-16 21:40:59 +11:00
Mordred Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Maru
b7f2ed462e 🗣 💩 2018-03-02 08:13:45 -03:00
Maru
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
083a3aa239 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Adam
b6cfa339d6 more opcodes 2018-02-25 15:16:42 +11:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred Admin
c54ebbe53c Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
goaaats
9790594016 Implement correct handling for private areas 2018-02-08 15:05:29 +01:00
Adam
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred
7a75b40ce6 Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Mordred
c36dec91d5 Reconnecting during an instance now possible 2018-02-04 17:46:46 +01:00
Mordred
ab30d8b344 Fixed zone updates being extremly slow, fixed crash with wrong item reward field, fixed wrong casttime for eventAction 2018-02-01 23:32:59 +01:00
Mordred
0b7468ead5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +01:00
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +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
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +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
137cc944b3 Begin of InstanceContent implementation 2018-01-28 13:49:51 +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