7 Commits

Author	SHA1	Message	Date
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
dongresource	df18f3ccd1	PROTOCOL_VERSION, test items, MOTD fix (#18) ... * Cleaned up protocol selection. * cmake now works even if protocol option is omitted * make now supports protocol selection * removed PACKET_VERSION/CNPROTO_VERSION* redundancy * ubuntu appveyor script has yet to be written * cleaned up some trailing spaces * Add some test items. Ironically, this change is untested. * [bugfix] Transmit MOTD when entering the game, not when loading screen fades. This fixes unnecessary retransmission when /warping.	2020-08-21 12:38:45 -05:00
Raymonf	0041da795a	Build multiple packet versions on AppVeyor for Windows (#14) ... * Move to PowerShell script for Windows build * Allow CMake to override struct version * PACKET_VERSION option * Rename CNPROTO_CUSTOM to CNPROTO_OVERRIDE Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>	2020-08-21 01:18:19 -04:00
Raymonf	da11220762	Allow opening CMakeLists as a CMake project in VS ... Added another check just in case someone wants to do this for some reason. It's bad. You shouldn't do it.	2020-08-20 18:44:30 -04:00
Raymonf	32a37acd5a	Update CMakeLists to use correct binary name and pthreads if not using MinGW/VS	2020-08-20 17:47:27 -04:00
Raymonf	c827b5a1b6	Lower CMake version requirement to 3.13 ... Technically we could probably move this all the way down to 3.6, but 3.13 should be a good version to target.	2020-08-20 17:21:43 -04:00
Raymonf	c549192f59	CMake build support (#8) ... * CMake build support * Make things nice for VS users Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>	2020-08-20 15:59:54 -04:00