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

1458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
ff380bde32
Merge pull request #326 from NotAdam/develop 
#314: fix items created via //gm item having incorrect data
 2018-06-30 08:35:45 +02:00
NotAdam
65c9647591 fix formatting 2018-06-30 12:49:47 +10:00
NotAdam
37b1500a09 inventory item creation cleanup 2018-06-30 12:49:34 +10:00
NotAdam
a2caccb2ee fix added items having incorrect data 2018-06-30 12:45:41 +10:00
NotAdam
0bd352b50b create larger stacks correctly, fix indent 2018-06-30 11:53:45 +10:00
Mordred
5a1830c59b Zone server actually works again 2018-06-28 23:42:12 +02:00
Mordred
1e89498d5f
Merge pull request #325 from itsMaru/packet_work 
Fix packet object slicing;
 2018-06-28 15:19:05 +02:00
Maru
bfab1588e0 no 2018-06-27 23:53:01 -03:00
Maru
f3c71b0076 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Mordred
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
Mordred
1564e8052e
Merge pull request #294 from DantestyleXD/action_return 
Return (Action 6) now work (again?)
 2018-06-26 07:56:29 +02:00
Mordred
7c1cb5f3bc
Merge pull request #292 from DantestyleXD/ManSea002 
ManSea002 now work properly
 2018-06-26 07:55:44 +02:00
Mordred
4ffd002296
Merge pull request #320 from DantestyleXD/ManFst003 
[Quest] ManFst003 added
 2018-06-26 07:54:55 +02:00
Dantestyle
088a8b03db MogLetter npcs struct add 2018-06-26 00:04:04 +02:00
Mordred
2de00dc70a
Merge pull request #322 from goaaats/ini_network_fixes 
zone, lobby, api: Streamline network configuration for new INI config
 2018-06-24 18:32:59 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
f414e70686 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00
goaaats
2b0e101459 Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Dantestyle
9c8a7f5318 update 2018-06-20 20:17:45 +02:00
Dantestyle
805eb07451 VS must hate me 2018-06-20 20:04:42 +02:00
Dantestyle
c189089f76 typo and style 2018-06-19 23:53:02 +02:00
Mordred
2860ee1640
Merge pull request #321 from NotAdam/develop 
cleanup script includes
 2018-06-19 08:08:28 +02:00
Mordred
685763ae73 Merge remote-tracking branch 'origin/develop' into packet_work 2018-06-18 23:04:00 +02:00
Mordred
4b3d356a70 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
cef9e36f97 cleanup script includes 2018-06-18 23:14:11 +10:00
Dantestyle
82da50d69e [Quest] ManFst003 added 2018-06-17 19:22:18 +02:00
Mordred
8391de9084
Merge pull request #319 from NotAdam/develop 
inventoryitemack opcode and some cleanup
 2018-06-16 17:05:47 +02:00
NotAdam
3c1bf4d328 inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Dantestyle
12ab33d5d1 [ Quest ] Now they work fine 2018-06-12 23:57:36 +02:00
Mordred
c0fd27f73b
Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
7aa801d34b fix playtime 2018-06-12 23:46:36 +10:00
NotAdam
8b6286230a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
d4695a7b75 set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
4023fa103f #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
28840bca52
Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
7662b46628 EObj anim 2018-06-12 09:29:21 +09:00
Dantestyle
5a1812773d Merge branch 'master' of https://github.com/DantestyleXD/Sapphire into Gridania_subquests 2018-06-11 22:04:40 +02:00
Mordred
a10875e51b
Merge pull request #307 from NotAdam/develop 
quest item handin inventory container id
 2018-06-11 14:46:39 +02:00
NotAdam
766340fc2d instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
7ae386521e handin inventory container id 2018-06-11 22:15:35 +10:00
NotAdam
8e25230a83 Merge branch 'upstream/develop' 2018-06-11 17:55:13 +10:00
Mordred
598d913ba9
Merge pull request #306 from NotAdam/develop 
remove xmlconfig and implement new configmgr
 2018-06-11 09:49:09 +02:00
NotAdam
18740964be maybe fix build 2018-06-11 03:17:16 +10:00
NotAdam
490cab7479 formatting 2018-06-11 02:44:42 +10:00
NotAdam
5a5202dd6b add default configs 2018-06-11 02:40:15 +10:00
NotAdam
463d56e76e remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
NotAdam
86cdd21d6f new config class for ini files 2018-06-11 02:28:03 +10:00
NotAdam
829c5ccea4 fix compile warning 2018-06-11 02:26:26 +10:00
NotAdam
d3d02b19fd Merge branch 'origin/master' 2018-06-11 01:54:06 +10:00
NotAdam
8692dc425e Merge branch 'upstream/master' 2018-06-10 21:37:39 +10:00