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

6109 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
cbe00da5f8 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02: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
5293e50614 Chat connection is actually reaching the handler now 2017-08-20 20:48:55 +02:00
Mordred
c5a06f7f21 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
d541bf0366 Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
02320755bf Merge sapphire-master 2017-08-20 12:54:54 -03:00
Maru
b54b489097 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
Mordred
b5d4e6385d 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
Maru
71309e3be7 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
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