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

1194 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Adam
45caae8041 Change buildroot to fix CMake error after VS2017.3 update 2017-08-15 16:54:01 +09:00
SapphireMordred
792879e17e 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
deed3296b5 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
adaf0bceba More skill scripting 2017-08-14 17:10:19 +02:00
amibu
d4564a02dc World ID parameter for lobby 2017-08-14 13:36:22 +02:00
Mordred
092896a047 Minor refactoring 2017-08-13 23:39:04 +02:00
Mordred
97ae40e93c Some style/readablity fixes 2017-08-13 23:33:36 +02:00
Mordred
2117505991 Fixed onlinestatus opcodes 2017-08-13 23:21:57 +02:00
Mordred
2fe10bda85 fixed playerstates being set incorrectly 2017-08-13 18:28:05 +02:00
SapphireMordred
a1999590b1 Merge pull request #47 from itsmaru/master 
Sorted out power/param property of status (partially)
 2017-08-13 09:05:44 +02:00
Maru
4f14f44b0d Renaming power to param; 
Removing unknown property as argument from the script and GameCommandHandler method;
 2017-08-12 22:36:52 -03:00
Maru
f124b5eac4 Sorted out power property of status (partially) 2017-08-12 22:11:56 -03:00
SapphireMordred
db1832aeef Merge pull request #46 from Minoost/matchmaking 
Implement basic duty finder window response
 2017-08-12 17:04:39 +02:00