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

309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maru
efa4a39e50 Merge sapphire-master 2017-08-20 17:43:07 -03:00
Mordred
0e8a5c3820 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02:00
Mordred
c5a06f7f21 Chat connection is actually reaching the handler now 2017-08-20 20:48:55 +02:00
Maru
d541bf0366 Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
b54b489097 Merge sapphire-master 2017-08-20 12:54:54 -03:00
Mordred
b5d4e6385d Removed firstlogin flag, still in database though 2017-08-20 17:52:22 +02:00
Maru
71309e3be7 Cast interrupting; Skeleton of battle calculation stuff; 2017-08-20 02:46:06 -03:00
Mordred
c6e65b8703 #34 - Implemented tracking of opnening sequence, firstlogin may be obsolete now 2017-08-20 02:24:19 +02:00
Maru
edef711afb Weapon Damage property; Auto-attack for magical weapons; 2017-08-19 16:50:50 -03:00
SapphireMordred
6d74cc3598 Merge pull request #64 from Minoost/master 
Reimplement CFPenaltyTime to reflect recent refactoring
 2017-08-19 09:19:25 +02:00
Minho Kang
f6c40f6f2e Reimplement of CFPenaltyTime 
Reimplement a730ef3 to reflect recent refactoring.
 2017-08-19 11:28:04 +09:00
Minho Kang
c6bd508ec7 Fix getTimeMs not returning correct unix epoch 
Turned out high_resolution_clock did not return current UTC time. Use system_clock to fix it.
 2017-08-19 11:26:16 +09:00
Mordred
60d67952e4 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-19 00:18:51 +02:00
Mordred
3ecc1e6f14 more restructuring 2017-08-19 00:18:40 +02:00
SapphireMordred
1602d6b2b0 Merge pull request #63 from Minoost/master 
Add JetBrains cache (CLion) to gitignore
 2017-08-18 19:04:59 +02:00
Minho Kang
50bff73e0a Add JetBrains cache to gitignore 2017-08-19 01:46:23 +09:00
Minho Kang
8979bcdd8f Merge remote-tracking branch 'upstream/master' 2017-08-19 00:49:54 +09:00
SapphireMordred
f49d288182 Merge pull request #62 from Minoost/clean 
Clean .gitignore and .gitmodules
 2017-08-18 17:42:46 +02:00
Mordred
432d979c73 Forgot script folder 2017-08-18 17:29:36 +02:00
Mordred
ff2d46751d Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-18 17:16:19 +02:00
Mordred
d3f6fc9a67 Massivly modified project structure in server_zone 2017-08-18 17:16:15 +02:00
Minho Kang
cae5b09744 Merge remote-tracking branch 'upstream/master' 2017-08-18 23:51:33 +09:00
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