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

6381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
dbf0ce5284 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Mordred
07e754c790 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-17 22:39:18 +02:00
Mordred
64f603e48e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-17 22:39:18 +02:00
Mordred
e7cf9f9dbe Changed director trigger/function names 2018-07-17 22:39:04 +02:00
Mordred
d96c86853b Changed director trigger/function names 2018-07-17 22:39:04 +02:00
Mordred
fd089faee8 Merge pull request #301 from DantestyleXD/Gridania_subquests 
<WiP > Gridania subquests
 2018-07-17 22:22:06 +02:00
Mordred
efad5ef383
Merge pull request #301 from DantestyleXD/Gridania_subquests 
<WiP > Gridania subquests
 2018-07-17 22:22:06 +02:00
Mordred
2c242997e6 Merge pull request #346 from DantestyleXD/eventhelper 
more Eventhelper on chat
 2018-07-17 16:15:31 +02:00
Mordred
ccd03aed65
Merge pull request #346 from DantestyleXD/eventhelper 
more Eventhelper on chat
 2018-07-17 16:15:31 +02:00
Mordred
35f56177c6 Update EventHelper.cpp 2018-07-17 16:11:09 +02:00
Mordred
8ac7191502
Update EventHelper.cpp 2018-07-17 16:11:09 +02:00
Mordred
c77d5f65dc Merge pull request #353 from takhlaq/develop 
added some pvp initui fields
 2018-07-17 16:08:29 +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
a2651b6909 added some pvp initui fields 2018-07-17 13:10:42 +01:00
Tahir Akhlaq
1cf1b8c161 added some pvp initui fields 2018-07-17 13:10:42 +01:00
Mordred
877db0ee60 Merge pull request #352 from NotAdam/develop 
initui
 2018-07-17 13:56:55 +02:00
Mordred
f687300cac
Merge pull request #352 from NotAdam/develop 
initui
 2018-07-17 13:56:55 +02:00
NotAdam
d66127c287 inutui 💦 2018-07-17 21:47:26 +10:00
NotAdam
dd0a29d898 inutui 💦 2018-07-17 21:47:26 +10:00
Mordred
513ae3e1e7 Merge pull request #351 from NotAdam/develop 
anima completion & camera mode clienttrigger
 2018-07-17 13:25:14 +02:00
Mordred
6be39877dc
Merge pull request #351 from NotAdam/develop 
anima completion & camera mode clienttrigger
 2018-07-17 13:25:14 +02:00
NotAdam
d0838957b5 anima completion & camera mode clienttrigger 2018-07-17 20:55:05 +10:00
NotAdam
ab8ca8feac anima completion & camera mode clienttrigger 2018-07-17 20:55:05 +10:00
Mordred
b34e2f92ea Update ServerZoneDef.h 2018-07-17 12:11:59 +02:00
Mordred
86fbbd1ae0
Update ServerZoneDef.h 2018-07-17 12:11:59 +02:00
Mordred
ab1d4e6694 Added aetherCurrent mapping and classified some pvp fields 2018-07-17 01:04:59 +02:00
Mordred
df44cb9ca1 Added aetherCurrent mapping and classified some pvp fields 2018-07-17 01:04:59 +02:00
Mordred
b3b65dacd9 Another chunk of initui data mapped 2018-07-17 00:36:10 +02:00
Mordred
629369b5d5 Another chunk of initui data mapped 2018-07-17 00:36:10 +02:00
Mordred
1eb9f91446 Erm, that did not happen 2018-07-16 18:50:04 +02:00
Mordred
441332fbc9 Erm, that did not happen 2018-07-16 18:50:04 +02:00
Mordred
831bd33140 More InitUI fixing 2018-07-16 18:48:25 +02:00
Mordred
34aa349d11 More InitUI fixing 2018-07-16 18:48:25 +02:00
Mordred
0a3f48d6ab Merge pull request #350 from AriAvery/develop 
initial housing setup
 2018-07-16 18:06:21 +02:00
Mordred
db839ebd24
Merge pull request #350 from AriAvery/develop 
initial housing setup
 2018-07-16 18:06:21 +02:00
AriAvery
7cef56e111 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
3158df44a7 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
774fa1dd7b removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
28d6c8fe61 removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
f00efb367a Revert "fixed style #4" 
This reverts commit 4aa45fd71b.
 2018-07-16 16:21:01 +02:00
AriAvery
2054a87cf7 Revert "fixed style #4" 
This reverts commit 500b194762.
 2018-07-16 16:21:01 +02:00
AriAvery
4aa45fd71b fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
500b194762 fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
9051ce6f11 added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
e4aeaaae8b added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
7f3583f305 fixed style #3 2018-07-16 12:37:04 +02:00
AriAvery
d5b7520e22 fixed style #3 2018-07-16 12:37:04 +02:00
AriAvery
7ef913ad19 fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
627a816f6e fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
57e1ed8503 fixed style 2018-07-16 11:58:25 +02:00