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

112 commits

Author SHA1 Message Date
XeAri
cb828c051d
:/ 2018-11-10 19:15:04 +01:00
XeAri
97724d1871
Merge branch 'housing' into housing 2018-11-10 19:11:43 +01:00
AriAvery
dadc8184e9 House fixes 2018-11-10 19:00:13 +01:00
Mordred
155b59785b Start of land interaction 2018-11-10 12:48:19 +01:00
AriAvery
cd589033ad More stuff 2018-11-07 11:59:59 +01:00
Mordred
a72f3b122c Sending quest info on loading finish, fixes housing login crash 2018-11-06 23:36:34 +01:00
Mordred
1f1b524d6f Fixed various small offset issues / packet sizes 2018-11-06 23:25:37 +01:00
mordred
bd0cf1718a Field size fix 2018-11-06 13:05:39 +01:00
mordred
c0a0594463 Added getter and setter for territoryId to player 2018-11-06 10:48:46 +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
aff82d430e More CI fixes 2018-10-26 14:11:02 +02:00
mordred
b0b2b89237 More boost gone 2018-10-25 15:15:27 +02:00
NotAdam
4e3edbbcd2 remove more boost 2018-10-25 12:44:51 +11:00
Squall Leonhart
6be4bb36b0 These should be the only references. 2018-10-20 15:39:20 +03:00
Squall Leonhart
7297c92348 Add level1 to setCLassJob. 2018-10-20 13:56:01 +03:00
Biscuit Boy
658046c132 Should probs mention it's decimal not hex 2018-09-20 00:00:01 +10:00
Biscuit Boy
94b05d5362 Fix InitZone bitmask and add my findings 2018-09-19 23:53:34 +10:00
Mordred
275ac206a9 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc 2018-09-17 23:10:59 +02:00
Mordred
6ff116a9e1 Inventory fix 2018-09-17 22:52:57 +02:00
Mordred Admin
150ce725bc Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
95b549a5bf
Fixed discovery information not being used correctly. 2018-09-17 08:41:09 +02:00
Mordred
eccb946a4c Mobs can now be spawned from templates using debug commands 2018-09-13 22:14:31 +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
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
5302db1fcb Some cleanups in preperation for bnpcs 2018-08-28 00:17:51 +02:00
NotAdam
be1a5d53f3 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
7f448494ed EquipSlot -> GearSetSlot 2018-08-25 22:56:46 +10:00
Mordred
f5aba946be Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
Mordred
8555f3060f Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
c84beee30a replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
NotAdam
9d7896043c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
Mordred
dbf0ce5284 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Maru
b15cd4948a InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
c12c0b1d99 Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
467bcf4163 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Maru
542541b1f6 Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
f6d387c161 Emotes can now be interrupted, getting in and out of persistant emotes including /sit should work fine, too #329 2018-07-08 23:44:37 +02:00
Mordred
a5191c2b4f emotes with motion only added #329 2018-07-08 23:25:27 +02:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
92cfe1e2a5 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
Mordred Admin
a3d5dc8c26 Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Action/EventAction.cpp
	src/servers/sapphire_zone/Actor/Chara.cpp
	src/servers/sapphire_zone/Actor/EventObject.cpp
	src/servers/sapphire_zone/Actor/Player.cpp
	src/servers/sapphire_zone/Actor/PlayerInventory.cpp
	src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
	src/servers/sapphire_zone/Zone/Zone.cpp
 2018-07-03 15:01:13 +02:00
Mordred
b28a4e6776
Merge pull request #323 from goaaats/actor_control_redo 
common, zone: Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl
 2018-07-03 14:38:57 +02:00
Mordred Admin
b2aeed0f8a Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
 2018-07-03 09:32:14 +02:00
Mordred Admin
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
b784c9e311 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
d4133f19d9
Merge pull request #287 from AcedArmy/actor_rewrite 
Fixed making new zones and done some more gm stuff
 2018-07-02 11:34:47 +02:00
Biscuit Boy
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
667ab110b9 Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00