OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
OpenFusion/src
History
darkredtitan 5cf7225f52
Tried to manually merge kamilprzyb and main repo's code (#45) 
* Merge kamilprzyb and main repo's code

* Update Makefile by FunnHornhoover

* Update Makefile by FinnHornhoover

* Add flag to Makefile by FinnHornhoover

* Remove extra line from makefile

* Remove lbcrypt from Makefile

* Fix flag to Makefile by FinnHornhoover

* Reimplement potential fix for tutorial blackscreen by Dongresources

* Update CMakeLists.txt

* Update CMakeLists.txt

* Reinsert Jade's changes

* Cosmetic Changes to Databases .h & .cpp

* Remove CMakeSettings.json

* Update Makefile by Finn Hornhoover

* More cosmetic changes to Databases.cpp

* More cosmetic changes to Databases.cpp

* Remove unnecessary line (CMakeSettings.json)

* Fix CNLoginServer.cpp

* More cosmetic Changes to Database.hpp, edit Database.cpp to use JSON library onstead of json11 library, and delete json11 library files

* Delete json11 library files

* Delete JSON library to reupload

* Reupload JSON library from main repo

* Reupload JSON library from main repo

* Fix syntax error

* Fix Makefile

* Remove commented line of code to be like master

Co-authored-by: CPunch <sethtstubbs@gmail.com>
 		2020-08-28 13:02:03 -05:00
..
contrib Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
mingw inital commit 2020-08-18 15:42:30 -05:00
structs added AINVEN_COUT for 0728 2020-08-21 00:31:00 -05:00
CNLoginServer.cpp Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
CNLoginServer.hpp Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
CNProtocol.cpp removed unnecessary allocation 2020-08-26 14:23:40 -05:00
CNProtocol.hpp Fixed a use-after-free and a memory leak. 2020-08-26 00:09:31 +02:00
CNShardServer.cpp Vehicle and trading bugfixes (#51) 2020-08-26 21:35:13 -05:00
CNShardServer.hpp added simple timer system to CNShardServer 2020-08-24 16:11:40 -05:00
CNShared.cpp fixed warnings for windows mingw 2020-08-19 15:42:44 -05:00
CNShared.hpp Replace ifdef guards with #pragma once 2020-08-23 19:14:54 +02:00
CNStructs.cpp fixed warnings for VC++ 2020-08-22 13:38:27 -05:00
CNStructs.hpp Replace ifdef guards with #pragma once 2020-08-23 19:14:54 +02:00
ChatManager.cpp Dynamically allocate the Player struct in PlayerView. 2020-08-25 00:59:55 +02:00
ChatManager.hpp Replace ifdef guards with #pragma once 2020-08-23 19:14:54 +02:00
Database.cpp Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
Database.hpp Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
Defines.cpp Fix crash when receiving invalid packets with very low ids. 2020-08-26 22:22:52 +02:00
Defines.hpp fixed warnings for VC++ 2020-08-22 13:38:27 -05:00
ItemManager.cpp Vehicle and trading bugfixes (#51) 2020-08-26 21:35:13 -05:00
ItemManager.hpp Vehicle and trading bugfixes (#51) 2020-08-26 21:35:13 -05:00
MissionManager.cpp Add player revive, vehicle mount/dismount and more (#33) 2020-08-24 16:04:56 -05:00
MissionManager.hpp Add player revive, vehicle mount/dismount and more (#33) 2020-08-24 16:04:56 -05:00
NPC.hpp Populated the future with scraped mobs. 2020-08-26 04:57:59 +02:00
NPCManager.cpp Fix crash when receiving invalid packets with very low ids. 2020-08-26 22:22:52 +02:00
NPCManager.hpp Implement NPC spawning. 2020-08-25 04:28:42 +02:00
NanoManager.cpp Fix a bug where nanos aren't unsummoned when unequipped. 2020-08-25 20:30:20 +02:00
NanoManager.hpp Fix a bug where nanos aren't unsummoned when unequipped. 2020-08-25 20:30:20 +02:00
Player.cpp inital commit 2020-08-18 15:42:30 -05:00
Player.hpp Vehicle and trading bugfixes (#51) 2020-08-26 21:35:13 -05:00
PlayerManager.cpp Vehicle and trading bugfixes (#51) 2020-08-26 21:35:13 -05:00
PlayerManager.hpp Respawn points work now. 2020-08-25 03:34:53 +02:00
main.cpp Tried to manually merge kamilprzyb and main repo's code (#45) 2020-08-28 13:02:03 -05:00
settings.cpp Decoupled player and NPC view distance. 2020-08-26 04:58:17 +02:00
settings.hpp Decoupled player and NPC view distance. 2020-08-26 04:58:17 +02:00