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

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
f24bfaf74c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
NotAdam
9ab3a63030 update effect struct, knockback effect type 2018-07-21 15:39:58 +10:00
Mordred
6579a5d841 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
e7cf9f9dbe 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
2c242997e6 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
c77d5f65dc 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
Mordred
877db0ee60 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
Mordred
513ae3e1e7 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
Mordred
b34e2f92ea 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
b3b65dacd9 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
831bd33140 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
AriAvery
7cef56e111 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
f00efb367a Revert "fixed style #4" 
This reverts commit 4aa45fd71b.
 2018-07-16 16:21:01 +02:00
AriAvery
4aa45fd71b fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
9051ce6f11 added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
7f3583f305 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
57e1ed8503 fixed style 2018-07-16 11:58:25 +02:00
AriAvery
3593b374ff init housing setup 2018-07-15 23:59:15 +02:00
Mordred
95ad4cbb87 Yet again more InitUI 2018-07-15 23:58:18 +02:00
Mordred
979093bdf0 Merge pull request #348 from itsMaru/develop 
InitUI pose def + set val;
 2018-07-15 21:08:58 +02:00
Maru
3032d9dc31 InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
144f4bc52d More InitUI adjustments 2018-07-14 13:49:30 +02:00
Mordred
6d62c7b574 More initui adjustments 2018-07-14 00:11:28 +02:00
Mordred
5ebee68a39 Updated InitUI, still alot of it scrambled after last update 2018-07-12 23:39:14 +02:00
Mordred
b5bee7cfcb fixes #122 - Searchmessages wont be overwritten anymore 2018-07-12 20:01:38 +02:00
Mordred
dedc81bc9d Merge pull request #347 from NotAdam/develop 
fix emotes that unholster weapons and sit animations work now
 2018-07-12 13:22:31 +02:00
NotAdam
a1ec09db72 fix sitting animating incorrectly for other clients, fixes #329 2018-07-12 21:10:02 +10:00
NotAdam
0305777e38 fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Dantestyle
8e14dd3806 more EventHelper on chat, I like them 2018-07-12 01:39:16 +02:00
Mordred
d09cdb15af Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
Mordred
39f58d1bdc Merge pull request #345 from NotAdam/develop 
fix persist emotes not persisting & exiting out of a sit emote
 2018-07-11 15:46:41 +02:00
NotAdam
abbf5c11fc sit now works correctly when doing /sit while sitting 2018-07-11 20:43:03 +10:00
NotAdam
0b88f63aa9 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Mordred
ae38f300e0 Merge pull request #344 from NotAdam/develop 
fixed inter-instance gm calling
 2018-07-10 12:26:05 +02:00
NotAdam
fccf3daf95 style 2018-07-10 20:25:08 +10:00
NotAdam
69a8086d7f fixed inter-instance gm calling, fixes #341 
as a note, calling someone into an instance has been disabled
 2018-07-10 20:22:46 +10:00
Mordred
7fc434687c Merge pull request #343 from takhlaq/develop 
changed player.setQuestBitFlag functions to allow unsetting the bit
 2018-07-09 23:11:51 +02:00
Tahir Akhlaq
cf184bda51 changed player.setQuestBitFlag functions to allow unsetting the bit 2018-07-09 21:53:23 +01:00
Mordred
533ba50447 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00