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

6945 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
c6e65b8703 #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
Maru
edef711afb 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
SapphireMordred
6d74cc3598 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
Minho Kang
f6c40f6f2e 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
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
ee53c84ebc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-19 00:18:51 +02:00
Mordred
60d67952e4 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
Mordred
3ecc1e6f14 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
SapphireMordred
1602d6b2b0 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
Minho Kang
50bff73e0a 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
Minho Kang
8979bcdd8f 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
SapphireMordred
f49d288182 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
432d979c73 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
ff2d46751d 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
Mordred
d3f6fc9a67 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
Minho Kang
cae5b09744 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
Minho Kang
32682a7f03 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
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
Adam
21795cb310 Cleanup .gitignore and .gitsubmodule 
Git shouldn't track submodule directory anymore.
 2017-08-18 23:48:35 +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
7487acb98d Merge pull request #60 from Minoost/cmake 
Initial attempt to fix 64bit build
 2017-08-18 14:33:13 +02:00
SapphireMordred
7f9a3f99c5 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
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
Adam
9e4519440f Add /bigobj switch for MSVC 
This fix an some error when building for x64
 2017-08-18 11:52:59 +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
5c8055a587 Removal of outdated Globals.h 2017-08-17 18:12:29 +02:00
Mordred
e4d2c3464c 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
94637b6795 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
61be1ec2c3 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
Mordred
ee28a61ae1 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