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
86fbbd1ae0
Update ServerZoneDef.h 2018-07-17 12:11:59 +02:00
Mordred
df44cb9ca1 Added aetherCurrent mapping and classified some pvp fields 2018-07-17 01:04:59 +02:00
Mordred
629369b5d5 Another chunk of initui data mapped 2018-07-17 00:36:10 +02:00
Mordred
441332fbc9 Erm, that did not happen 2018-07-16 18:50:04 +02:00
Mordred
34aa349d11 More InitUI fixing 2018-07-16 18:48:25 +02:00
Mordred
db839ebd24
Merge pull request #350 from AriAvery/develop 
initial housing setup
 2018-07-16 18:06:21 +02:00
AriAvery
3158df44a7 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
28d6c8fe61 removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
2054a87cf7 Revert "fixed style #4" 
This reverts commit 500b194762.
 2018-07-16 16:21:01 +02:00
AriAvery
500b194762 fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
e4aeaaae8b added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
d5b7520e22 fixed style #3 2018-07-16 12:37:04 +02:00
AriAvery
627a816f6e fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
d31a33732c fixed style 2018-07-16 11:58:25 +02:00
AriAvery
9aeba7a0b3 init housing setup 2018-07-15 23:59:15 +02:00
Mordred
87f9610d20 Yet again more InitUI 2018-07-15 23:58:18 +02:00
Mordred
80264f1598
Merge pull request #348 from itsMaru/develop 
InitUI pose def + set val;
 2018-07-15 21:08:58 +02:00
Maru
b15cd4948a InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
ccd581682a More InitUI adjustments 2018-07-14 13:49:30 +02:00
Mordred
1ea4158256 More initui adjustments 2018-07-14 00:11:28 +02:00
Mordred
510fc101bb Updated InitUI, still alot of it scrambled after last update 2018-07-12 23:39:14 +02:00
Mordred
4308757379 fixes #122 - Searchmessages wont be overwritten anymore 2018-07-12 20:01:38 +02:00
Mordred
09283a6377
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
b856356ce7 fix sitting animating incorrectly for other clients, fixes #329 2018-07-12 21:10:02 +10:00
NotAdam
5eb846118d fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Dantestyle
db9e2faf55 more EventHelper on chat, I like them 2018-07-12 01:39:16 +02:00
Mordred
c12c0b1d99 Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
Mordred
77495fcfb9
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
c4f35b0753 sit now works correctly when doing /sit while sitting 2018-07-11 20:43:03 +10:00
NotAdam
467bcf4163 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Mordred
1acedc550f
Merge pull request #344 from NotAdam/develop 
fixed inter-instance gm calling
 2018-07-10 12:26:05 +02:00
NotAdam
7ee20730fa style 2018-07-10 20:25:08 +10:00
NotAdam
66fd8ba7fe 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
4979c8780d
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
ca5db2cae3 changed player.setQuestBitFlag functions to allow unsetting the bit 2018-07-09 21:53:23 +01:00
Mordred
3dcb7c3629 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00
Mordred
afbb247e1c Persistent emotes now show properly to other players on spawn 2018-07-09 21:48:42 +02:00
Mordred
84f6728dba
Merge pull request #342 from itsMaru/develop 
Emote stuff;
 2018-07-09 07:59:17 +02:00
Maru
542541b1f6 Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
f6d387c161 Emotes can now be interrupted, getting in and out of persistant emotes including /sit should work fine, too #329 2018-07-08 23:44:37 +02:00
Mordred
a5191c2b4f emotes with motion only added #329 2018-07-08 23:25:27 +02:00
Mordred
0c805a8f16
Merge pull request #340 from DantestyleXD/WeatherForeCast 
CmnDefWeatherForeCast script added
 2018-07-08 19:30:33 +02:00
Mordred
911acd8c2c
Merge pull request #334 from NotAdam/develop 
use structs for incoming packets & some cleanup
 2018-07-08 19:30:11 +02:00
NotAdam
cd3e2f0b52 inventorymodifyhandler packet structure 2018-07-08 21:11:22 +10:00
NotAdam
82b9c72d6f opcode updates 2018-07-08 19:45:46 +10:00
NotAdam
7b1281fba4 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
NotAdam
d1fe43fde3 add linkshell event, some cleanup 2018-07-08 12:38:08 +10:00
Dantestyle
3113ec4a38 CmnDefWeatherForeCast script added 2018-07-08 04:18:11 +02:00
Mordred
ece61d3d6d Fixed localtime 2018-07-08 00:59:22 +02:00
Mordred
bc01b0ccb1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00