mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +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
f5aba946be Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
Mordred
2f814ca60e Inventory Overhaul wrapup 2018-07-26 23:40:46 +02:00
Mordred
a6c269d9bf
Merge pull request #361 from NotAdam/inventory_rework 
currency & crystals are now stored in charaiteminventory instead of isolated tables
 2018-07-26 16:58:00 +02:00
NotAdam
d8afc7a83e remove a 2nd space in //gm gil output 2018-07-26 23:38:58 +10:00
NotAdam
460d4c79b7 the last commit was shit, now it's done properly 2018-07-26 23:37:12 +10:00
NotAdam
47f86e13c7 improve behaviour for creating items with correct max stack sizes 2018-07-26 23:29:58 +10:00
NotAdam
4385923129 currency and crystal are now multistorage containers 2018-07-26 23:21:57 +10:00
NotAdam
cf661c57df fix CurrencyCrystalInfo opcode 2018-07-26 23:17:39 +10:00
NotAdam
2bcc2b713f remove now unused sql tables 2018-07-26 23:12:38 +10:00
NotAdam
791f934a2d fix loading of currency/crystal items 2018-07-26 23:12:02 +10:00
Mordred Admin
783bd655a8 Inventory code cleanup number 2, packetWrapper for slot update 2018-07-26 14:09:09 +02:00
Mordred Admin
260092f542 Storing container configuration in container object 2018-07-25 14:03:43 +02:00
Mordred
2f6805fedc
Merge pull request #359 from NotAdam/develop 
fix the indenting in doxygen css
 2018-07-25 12:03:38 +02:00
NotAdam
4094ac7021 fix the indenting 2018-07-25 19:59:59 +10:00
Mordred Admin
e11f1b3f20 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
086ab230c2
Merge pull request #358 from NotAdam/develop 
doxygen & some documentation
 2018-07-25 09:18:06 +02:00
Mordred
8555f3060f Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
ad330dc3e0 minor css fixes 2018-07-25 00:36:12 +10:00
NotAdam
1a73a6c448 dark theme for doxygen 2018-07-25 00:31:33 +10:00
NotAdam
0bae255d21 doco cleanup 2018-07-24 23:16:26 +10:00
NotAdam
ebd41c0312 new documentation home page - please look forward to it 2018-07-24 23:04:22 +10:00
NotAdam
a1e3721c67 ignore temp files created by doxygen 2018-07-24 22:49:19 +10:00
NotAdam
c47b953a27 some more documentation 2018-07-24 22:48:42 +10:00
NotAdam
31915f9fee doxygen doco generation + some documentation for script system 2018-07-24 22:22:19 +10:00
Mordred
b64c56faa1
Merge pull request #357 from NotAdam/develop 
new effect packet + base gilshop implementation
 2018-07-22 23:37:09 +02:00
NotAdam
5ac4573bd3 gilshops now work using the proper packet 2018-07-23 00:05:44 +10:00
NotAdam
b8871519fe minor refactoring 2018-07-22 23:32:16 +10:00
NotAdam
9ab7d5c68a somewhat working gilshops 2018-07-22 23:20:22 +10:00
NotAdam
18a1ab79d6 extremely broken gilshop implementation 2018-07-22 22:11:03 +10:00
NotAdam
bf726c2a48 consistent indentation 2018-07-22 22:05:09 +10:00
NotAdam
d68fa6d192 remove const constraint 2018-07-22 19:10:52 +10:00
NotAdam
394988fbb0 scripts cleanup, npc repair script and hunt board 2018-07-22 17:02:09 +10:00
NotAdam
893ebd3454 move common effect struct members into a shared struct for single target/aoe 2018-07-22 16:54:23 +10:00
NotAdam
68b08de1de housing placard script, gridania mb script, opcodes 2018-07-22 16:54:01 +10:00
NotAdam
2665e55a17 aoeeffect8/16/24/32 packet defs/opcodes 2018-07-21 23:48:14 +10: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
NotAdam
3131d36ea6 update effect struct, knockback effect type 2018-07-21 15:39:58 +10:00
Mordred
dbf0ce5284 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Mordred
64f603e48e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-17 22:39:18 +02:00
Mordred
d96c86853b Changed director trigger/function names 2018-07-17 22:39:04 +02:00
Mordred
efad5ef383
Merge pull request #301 from DantestyleXD/Gridania_subquests 
<WiP > Gridania subquests
 2018-07-17 22:22:06 +02:00
Mordred
ccd03aed65
Merge pull request #346 from DantestyleXD/eventhelper 
more Eventhelper on chat
 2018-07-17 16:15:31 +02:00
Mordred
8ac7191502
Update EventHelper.cpp 2018-07-17 16:11:09 +02:00
Mordred
7a74618de9
Merge pull request #353 from takhlaq/develop 
added some pvp initui fields
 2018-07-17 16:08:29 +02:00
Tahir Akhlaq
1cf1b8c161 added some pvp initui fields 2018-07-17 13:10:42 +01:00
Mordred
f687300cac
Merge pull request #352 from NotAdam/develop 
initui
 2018-07-17 13:56:55 +02:00
NotAdam
dd0a29d898 inutui 💦 2018-07-17 21:47:26 +10:00
Mordred
6be39877dc
Merge pull request #351 from NotAdam/develop 
anima completion & camera mode clienttrigger
 2018-07-17 13:25:14 +02:00
NotAdam
ab8ca8feac anima completion & camera mode clienttrigger 2018-07-17 20:55:05 +10:00