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

1737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Minho Kang
32682a7f03 Merge remote-tracking branch 'origin/clean' 2017-08-18 23:50:58 +09:00
Minho Kang
13bf239b6b Force git to ignore submodule 
https://stackoverflow.com/questions/5127178/gitignore-files-added-inside-git-submodules
 2017-08-18 23:50:22 +09:00
Minho Kang
826b46a663 Cleanup .gitignore and .gitsubmodule 
Git shouldn't track submodule directory anymore.
 2017-08-18 23:48:35 +09:00
SapphireMordred
7f9a3f99c5 Merge pull request #60 from Minoost/cmake 
Initial attempt to fix 64bit build
 2017-08-18 14:33:13 +02:00
Minho Kang
78b5a13f8a Fix segfault on 64bit 
Upper portion of address data got lost when converting to int32_t and segfault when accessing them. This commit contains fix for it.
 2017-08-18 21:14:09 +09:00
Minho Kang
d7c5c4f23e Add /bigobj switch for MSVC 
This fix an some error when building for x64
 2017-08-18 11:52:59 +09:00
Mordred
e4d2c3464c Removal of outdated Globals.h 2017-08-17 18:12:29 +02:00
Mordred
94637b6795 Removal of redundant namespace qualifiers 2017-08-17 17:45:45 +02:00
Mordred
61be1ec2c3 Fixed compiler warning in eventhandlers 2017-08-17 17:39:08 +02:00
Mordred
ee28a61ae1 Fixed headers in Eventhandlers.cpp 2017-08-17 17:36:40 +02:00
SapphireMordred
de6a3adb94 Merge pull request #59 from Minoost/cmake 
Remove VS2015 boost compiler from CMake
 2017-08-17 17:30:33 +02:00
Mordred
e9a5763533 Changed handlers to take a const& instead of a shared_ptr of inPacket 2017-08-17 17:30:00 +02:00
Minho Kang
98e7873afe Remove VS2015 boost compiler from CMake 
This changes let CMake determine which boost compiler to use and therefore allowing it to use toolchain other than VS2015.
 2017-08-17 23:48:47 +09:00
Minho Kang
ce2dcb5530 Merge remote-tracking branch 'upstream/master' 2017-08-17 23:44:04 +09:00
Mordred
10814d98ce Split off ActionHandlers from PacketHandlers 2017-08-17 16:19:20 +02:00
Mordred
49c65c8573 Split off InventoryHandler from PacketHandlers 2017-08-17 16:17:25 +02:00
Mordred
ef7d941921 Removed @set quest command 2017-08-17 16:14:24 +02:00
Mordred
476707b6c4 Removed a unused class 2017-08-17 00:09:28 +02:00
Mordred
99b86c63a2 Split of content finder handlers 2017-08-17 00:07:42 +02:00
Mordred
140b457a2a Refactoring packethandlers, further split them up 2017-08-17 00:00:41 +02:00
Mordred
32231fe61f #58 - Fixed roleplaying tag not showing up 2017-08-16 22:59:53 +02:00
SapphireMordred
62a4ad83c4 Merge pull request #56 from amibu01/master 
Status Effect fixes, more skill scripting, fixing insta cast skills for real
 2017-08-15 17:25:07 +02:00
amibu
f429320ae0 Forgot something 2017-08-15 16:19:55 +02:00
amibu
04814a3f15 More skill scripting, fixing insta cast skills for real 2017-08-15 16:15:29 +02:00
amibu
5ae9099f2b Fixed status effects being added multiple times 2017-08-15 15:48:52 +02:00
SapphireMordred
4fe030d90d Merge pull request #54 from Minoost/master 
Add Core::Util::getTimeSeconds()
 2017-08-15 14:26:56 +02:00
Minho Kang
74a63b3b09 Add Core::Util::getTimeSeconds() 
Get unix time in seconds
 2017-08-15 19:47:58 +09:00
SapphireMordred
b1c3742e53 Merge pull request #53 from amibu01/master 
DoTs/HoTs, fixed status effects for players, more skill scripting and World ID parameter for lobby
 2017-08-15 11:48:15 +02:00
amibu
90614995cb DoTs/HoTs, fixed status effects for players 2017-08-15 11:51:59 +02:00
SapphireMordred
ec73f2a6b2 Merge pull request #52 from Minoost/master 
Change buildroot to fix CMake error after VS2017.3 update
 2017-08-15 09:57:31 +02:00
Minho Kang
0cfc4677da Change buildroot to fix CMake error after VS2017.3 update 2017-08-15 16:54:01 +09:00
SapphireMordred
e179e35531 Merge pull request #51 from AcedArmy/master 
Fixed a Typo From HP Command saying TP Instead
 2017-08-14 20:00:04 +02:00
Biscuit Boy
3d159eb65c Fixed a Typo From HP Command saying TP Instead 
Fixed a Typo from HP GM Command saying TP was set Instead of HP
 2017-08-15 01:49:02 +10:00
amibu
b267533908 More skill scripting 2017-08-14 17:10:19 +02:00
amibu
166e61d6f3 World ID parameter for lobby 2017-08-14 13:36:22 +02:00
Mordred
df98c09179 Minor refactoring 2017-08-13 23:39:04 +02:00
Mordred
83855ff027 Some style/readablity fixes 2017-08-13 23:33:36 +02:00
Mordred
2ded908891 Fixed onlinestatus opcodes 2017-08-13 23:21:57 +02:00
Mordred
5bbe38957d fixed playerstates being set incorrectly 2017-08-13 18:28:05 +02:00
SapphireMordred
ee96a0fadc Merge pull request #47 from itsmaru/master 
Sorted out power/param property of status (partially)
 2017-08-13 09:05:44 +02:00
Maru
14904192d0 Renaming power to param; 
Removing unknown property as argument from the script and GameCommandHandler method;
 2017-08-12 22:36:52 -03:00
Maru
76c50cc936 Sorted out power property of status (partially) 2017-08-12 22:11:56 -03:00
SapphireMordred
013bb3c998 Merge pull request #46 from Minoost/matchmaking 
Implement basic duty finder window response
 2017-08-12 17:04:39 +02:00
Minho Kang
dfb3e4163a Add debug log for CFRegisterDuty 2017-08-12 23:53:43 +09:00
SapphireMordred
349f929a76 Merge pull request #45 from SapphireMordred/64bit 
64bit build crap (merge SapphireLibs first)
 2017-08-12 16:47:17 +02:00
Minho Kang
7ff741884d Add basic cf packet handler 2017-08-12 23:20:26 +09:00
Minho Kang
5b1a3f9000 Update cfnotify packet 
It turned out CFNotify packet is a union. Change definition to reflect that.
 2017-08-12 19:05:26 +09:00
Mordred
c511616de3 Fixed an issue with UI disapearing when attuning 2017-08-12 10:25:50 +02:00
SapphireMordred
17ff80172d Merge pull request #44 from takhlaq/portability2 
add appveyor test
 2017-08-12 08:48:15 +02:00
Tahir Akhlaq
c8096d4ed0 add appveyor test 2017-08-12 02:41:06 +01:00