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

1809 commits

This branch
This branch
All branches
Author SHA1 Message Date
Biscuit Boy
2b3de5f5e6 label now comes before getter in //gm teri 2018-07-01 21:31:26 +10:00
Mordred
c3c3411565 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
6846e16fda fix formatting 2018-06-30 12:49:47 +10:00
NotAdam
200232ceed inventory item creation cleanup 2018-06-30 12:49:34 +10:00
NotAdam
820f755f17 fix added items having incorrect data 2018-06-30 12:45:41 +10:00
NotAdam
36ba7998de create larger stacks correctly, fix indent 2018-06-30 11:53:45 +10:00
Mordred
6797e61657 Zone server actually works again 2018-06-28 23:42:12 +02:00
Mordred
6d2b43e4c3 Merge pull request #325 from itsMaru/packet_work 
Fix packet object slicing;
 2018-06-28 15:19:05 +02:00
Maru
12ef194c7f no 2018-06-27 23:53:01 -03:00
Maru
65ea1ecac7 fix PacketContainer entrylist type; 2018-06-27 23:48:18 -03:00
Mordred
e9c9eaa53a Packet rework of server_zone 2018-06-28 00:07:07 +02:00
Mordred
196433ae59 Merge pull request #294 from DantestyleXD/action_return 
Return (Action 6) now work (again?)
 2018-06-26 07:56:29 +02:00
Mordred
333e1e99e0 Merge pull request #292 from DantestyleXD/ManSea002 
ManSea002 now work properly
 2018-06-26 07:55:44 +02:00
Mordred
9f13a4dc91 Merge pull request #320 from DantestyleXD/ManFst003 
[Quest] ManFst003 added
 2018-06-26 07:54:55 +02:00
Dantestyle
5b0b52482d MogLetter npcs struct add 2018-06-26 00:04:04 +02:00
Mordred
d6ec630976 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
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
goaaats
a042599a64 Add cmake objects.txt, exports.def to gitignore 2018-06-23 21:05:57 +02:00
goaaats
bd24cb524a Streamline INI network configuration 2018-06-23 21:05:31 +02:00
Dantestyle
72500b83c7 update 2018-06-20 20:17:45 +02:00
Dantestyle
7c512d5d30 VS must hate me 2018-06-20 20:04:42 +02:00
Dantestyle
43f3530d8f typo and style 2018-06-19 23:53:02 +02:00
Mordred
8a163bd693 Merge pull request #321 from NotAdam/develop 
cleanup script includes
 2018-06-19 08:08:28 +02:00
Mordred
98751e0d5c Merge remote-tracking branch 'origin/develop' into packet_work 2018-06-18 23:04:00 +02:00
Mordred
972cd05e48 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
NotAdam
0d2aeb63b1 cleanup script includes 2018-06-18 23:14:11 +10:00
Dantestyle
939117d584 [Quest] ManFst003 added 2018-06-17 19:22:18 +02:00
Mordred
f0c0ae3c24 Merge pull request #319 from NotAdam/develop 
inventoryitemack opcode and some cleanup
 2018-06-16 17:05:47 +02:00
NotAdam
f3a0a1533d inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
Dantestyle
7716fe8f54 [ Quest ] Now they work fine 2018-06-12 23:57:36 +02:00
Mordred
5c7b8e31e6 Merge pull request #318 from NotAdam/develop 
add item splitting and stacking
 2018-06-12 18:09:34 +02:00
NotAdam
a9ac2ca4c2 fix playtime 2018-06-12 23:46:36 +10:00
NotAdam
31c452559a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
12dcee8b8a set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
3ac70352d1 #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
460175f75d Merge pull request #317 from perize/develop 
EObj thing
 2018-06-12 06:22:28 +02:00
Perize
407bf76dc8 EObj anim 2018-06-12 09:29:21 +09:00
Dantestyle
6c6100170c Merge branch 'master' of https://github.com/DantestyleXD/Sapphire into Gridania_subquests 2018-06-11 22:04:40 +02:00
Mordred
d3bea5748c Merge pull request #307 from NotAdam/develop 
quest item handin inventory container id
 2018-06-11 14:46:39 +02:00
NotAdam
d3871ae6ce instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
NotAdam
0e1dd12535 handin inventory container id 2018-06-11 22:15:35 +10:00
NotAdam
0568acae59 Merge branch 'upstream/develop' 2018-06-11 17:55:13 +10:00
Mordred
cb2e45a5a4 Merge pull request #306 from NotAdam/develop 
remove xmlconfig and implement new configmgr
 2018-06-11 09:49:09 +02:00
NotAdam
84542b3927 maybe fix build 2018-06-11 03:17:16 +10:00
NotAdam
fd170f08dd formatting 2018-06-11 02:44:42 +10:00
NotAdam
0d7281e211 add default configs 2018-06-11 02:40:15 +10:00
NotAdam
2452410c58 remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
NotAdam
c034e4ca79 new config class for ini files 2018-06-11 02:28:03 +10:00
NotAdam
44c85b3136 fix compile warning 2018-06-11 02:26:26 +10:00
NotAdam
c62499363d Merge branch 'origin/master' 2018-06-11 01:54:06 +10:00