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

35 commits

Author SHA1 Message Date
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
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
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
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
Mordred
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
83cb17610c WiP - implementing new framework 2018-03-09 00:06:44 +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
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
aca7508d00 More include improvements 2018-02-28 11:14:25 +01:00
Mordred
692ca9d56e More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
6e5737f401 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
29918f5807 Fixed an issue with teleport not picking the correct target position, eventaction unlocks player now 2018-02-21 23:30:35 +01:00
Mordred
c1fb728a05 In range restructuring 2018-02-21 18:06:52 +01:00
Mordred
9a4e7533c6 Renaming classes in preperation of actor rework 2018-02-20 22:46:44 +01:00
Mordred
ba511a23e2 Revert "Changeing base access type of actors to gameobject" 
This reverts commit 7d916f7
 2018-02-19 22:00:32 +01:00
Mordred
7d916f7d86 Changeing base access type of actors to gameobject 2018-02-18 23:48:51 +01:00
Mordred
b8cbdf3fa5 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +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
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
9dfca22e10 Adjusted wrong casttime for eventactions, needs fixing in ex.json 2018-02-04 02:26:02 +01:00
Mordred
6f461ab1bc Fixed state flags 2018-02-04 00:43:36 +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
2adfdbc47d
Update ActionTeleport.cpp 2018-02-01 17:47:55 +01:00
goaaats
ed9a140ccc Fix cast time 2018-02-01 16:28:14 +01:00
goaaats
8a5d497c21 zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Mordred Admin
f3d5bf5fa6 Simplified handling of state flags 2018-01-11 14:59:39 +01:00
Mordred
bafc511db2 Another approach at event improvements 2018-01-09 23:50:54 +01:00
Mordred Admin
0f3f51c304 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00