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

457 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
5293e50614 Chat connection is actually reaching the handler now 2017-08-20 20:48:55 +02:00
Maru
3b77d239cf Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
02320755bf Merge sapphire-master 2017-08-20 12:54:54 -03:00
Mordred
f2918c378f Removed firstlogin flag, still in database though 2017-08-20 17:52:22 +02:00
Maru
13d784caff Cast interrupting; Skeleton of battle calculation stuff; 2017-08-20 02:46:06 -03:00
Mordred
6561cf566e #34 - Implemented tracking of opnening sequence, firstlogin may be obsolete now 2017-08-20 02:24:19 +02:00
Maru
f87261b1bb Weapon Damage property; Auto-attack for magical weapons; 2017-08-19 16:50:50 -03:00
SapphireMordred
bb4a84d51a Merge pull request #64 from Minoost/master 
Reimplement CFPenaltyTime to reflect recent refactoring
 2017-08-19 09:19:25 +02:00
Adam
98748a4100 Reimplement of CFPenaltyTime 
Reimplement a730ef3 to reflect recent refactoring.
 2017-08-19 11:28:04 +09:00
Adam
4d2a8ee36c 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
ee53c84ebc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-19 00:18:51 +02:00
Mordred
90ea65385d more restructuring 2017-08-19 00:18:40 +02:00
SapphireMordred
b702653d9e Merge pull request #63 from Minoost/master 
Add JetBrains cache (CLion) to gitignore
 2017-08-18 19:04:59 +02:00
Adam
86524cc53c Add JetBrains cache to gitignore 2017-08-19 01:46:23 +09:00
Adam
5cf2c97bf9 Merge remote-tracking branch 'upstream/master' 2017-08-19 00:49:54 +09:00
SapphireMordred
f442ed833b Merge pull request #62 from Minoost/clean 
Clean .gitignore and .gitmodules
 2017-08-18 17:42:46 +02:00
Mordred
9ab055aa6e Forgot script folder 2017-08-18 17:29:36 +02:00
Mordred
8f08ddb45b Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-18 17:16:19 +02:00
Mordred
5439e42062 Massivly modified project structure in server_zone 2017-08-18 17:16:15 +02:00
Adam
cfe046d59f Merge remote-tracking branch 'upstream/master' 2017-08-18 23:51:33 +09:00
Adam
5844fbafcb Merge remote-tracking branch 'origin/clean' 2017-08-18 23:50:58 +09:00
Adam
dc5bd5b1f3 Force git to ignore submodule 
https://stackoverflow.com/questions/5127178/gitignore-files-added-inside-git-submodules
 2017-08-18 23:50:22 +09:00
Adam
21795cb310 Cleanup .gitignore and .gitsubmodule 
Git shouldn't track submodule directory anymore.
 2017-08-18 23:48:35 +09:00
SapphireMordred
7487acb98d Merge pull request #60 from Minoost/cmake 
Initial attempt to fix 64bit build
 2017-08-18 14:33:13 +02:00
Adam
c460f8d1b4 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
Adam
9e4519440f Add /bigobj switch for MSVC 
This fix an some error when building for x64
 2017-08-18 11:52:59 +09:00
Mordred
5c8055a587 Removal of outdated Globals.h 2017-08-17 18:12:29 +02:00
Mordred
990a984312 Removal of redundant namespace qualifiers 2017-08-17 17:45:45 +02:00
Mordred
f0d83cadce Fixed compiler warning in eventhandlers 2017-08-17 17:39:08 +02:00
Mordred
79173bcbcd Fixed headers in Eventhandlers.cpp 2017-08-17 17:36:40 +02:00
SapphireMordred
99b48050ff Merge pull request #59 from Minoost/cmake 
Remove VS2015 boost compiler from CMake
 2017-08-17 17:30:33 +02:00
Mordred
99b1b1dcf0 Changed handlers to take a const& instead of a shared_ptr of inPacket 2017-08-17 17:30:00 +02:00
Adam
25472b1401 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
Adam
d694cbfcf5 Merge remote-tracking branch 'upstream/master' 2017-08-17 23:44:04 +09:00
Mordred
a7afabbf13 Split off ActionHandlers from PacketHandlers 2017-08-17 16:19:20 +02:00
Mordred
91f5d748e3 Split off InventoryHandler from PacketHandlers 2017-08-17 16:17:25 +02:00
Mordred
9ef129a3e9 Removed @set quest command 2017-08-17 16:14:24 +02:00
Mordred
213a85be08 Removed a unused class 2017-08-17 00:09:28 +02:00
Mordred
a3f87125ef Split of content finder handlers 2017-08-17 00:07:42 +02:00
Mordred
71eab1e434 Refactoring packethandlers, further split them up 2017-08-17 00:00:41 +02:00
Mordred
e7712bb346 #58 - Fixed roleplaying tag not showing up 2017-08-16 22:59:53 +02:00
SapphireMordred
7c9594ee7f 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
afe914d124 Forgot something 2017-08-15 16:19:55 +02:00
amibu
887918775e More skill scripting, fixing insta cast skills for real 2017-08-15 16:15:29 +02:00
amibu
7419823828 Fixed status effects being added multiple times 2017-08-15 15:48:52 +02:00
SapphireMordred
7e206fb3cd Merge pull request #54 from Minoost/master 
Add Core::Util::getTimeSeconds()
 2017-08-15 14:26:56 +02:00
Adam
8f2c030d1b Add Core::Util::getTimeSeconds() 
Get unix time in seconds
 2017-08-15 19:47:58 +09:00
SapphireMordred
bed32e9cc9 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
c92d907295 DoTs/HoTs, fixed status effects for players 2017-08-15 11:51:59 +02:00
SapphireMordred
784ce3dfa7 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