1
0
Fork 0
Commit Graph

190 Commits

Author SHA1 Message Date
Lukas Pioch 9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Mattes D 9871c0b073 Added CircleCI for stylechecking.
This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
2015-09-17 11:20:10 +02:00
Mattes D 76d2f85b9a Fixed Lua output folders for Windows builds.
Fixes #2468.
2015-09-08 09:12:02 +02:00
Mattes D dac97826f7 Renamed output directory to Server 2015-09-05 22:01:21 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Samuel Barney 561296f269 Leather Armor can now be dyed.
* Created new color class to handle dye-related coloring
2015-07-15 14:05:36 -06:00
Tiger Wang e69d4536ab Added JsonCPP library location to search paths
* Fixed '-dirty' submodule changes
Probably fixes an issue somewhere too?
2015-07-12 12:23:11 +01:00
Tiger Wang ccfe04a0a2 Updated and submodularised JsonCPP
Conflicts:
	lib/jsoncpp
2015-07-09 23:10:51 +01:00
Mattes D d390214929 SelfTests are registered and executed after logging framework init.
Fixes #2228.
2015-06-11 22:20:04 +02:00
Lane Kolbly 73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
Mattes D 649921f4a8 Provide some BuildInfo even for non-CI builds.
Ref.: #2204
2015-06-05 10:19:58 +02:00
tycho 4feccaa64a Clean up Spawn Prepare
Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread.
Also moved cSpawnPrepare into its own file
2015-05-30 00:19:20 +01:00
tycho e19693e529 Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Inventory.cpp
2015-05-28 11:05:41 +01:00
linnemannr 5049fd0fbf Support building on FreeBSD
SetFlags.cmake

	Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()

lib/sqlite/CMakeLists.txt

	Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
	POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
	controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
	to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
	and __POSIX_VISIBLE to the 199506 for POSIX.1c

lib/tolua++/CMakeLists.txt
src/CMakeLists.txt

	Add /usr/local/lib to the library search path for FreeBSD builds

src/OSSupport/Errors.cpp

	Correct the strerror_r() implementation determination to check whether
	_GNU_SOURCE is defined, not what it evaluates to
2015-05-24 20:07:31 -06:00
tycho 95b81b3ef1 Disable -Werror for warnings in tests. 2015-05-24 14:16:05 +01:00
tycho dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
tycho 77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
tycho b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
Mattes D 4b97569b3a ToLua now generates cLuaState::Push() and GetStackValue()
For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs.
Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings.
2015-05-12 09:20:54 +02:00
tycho 448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
Tiger Wang 2919d08883 Update submodules 2015-05-02 15:57:49 +01:00
Howaner 685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Mattes D 6f5e267d58 Implemented LibEvent-based client connections. 2015-01-22 20:12:40 +01:00
Mattes D a8a7488b54 Added the libevent library. 2015-01-22 20:12:39 +01:00
Mattes D c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D a971dee379 CMake: Fixed linux builds. 2014-11-26 12:45:53 +01:00
Mattes D 413e5c20fe Windows: Fixed builds with LeakFinder enabled. 2014-11-26 11:00:21 +01:00
Tiger Wang 79e5b82354 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
Mattes D 2467d29a4e Moved all Noise-related files into a separate folder. 2014-11-18 12:07:08 +01:00
Mattes D f683872f54 Refactored cRidgedNoise into a separate template.
This allows us to make the ridges out of any noise and to combine the cRidgedNoise with cOctavedNoise.
2014-11-18 09:49:53 +01:00
Mattes D 8c54fc0f7d OctavedNoise: linux compilation fixes. 2014-11-18 09:23:45 +01:00
Mattes D 765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Mattes D 449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Mattes D 27687cfcd4 Added FastRandom.* back to CMakeLists.txt. 2014-10-23 08:41:57 +02:00
Tiger Wang 2b920f9e21 Compile fix? 2014-10-21 13:49:53 +01:00
Tiger Wang bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Tycho 27be179939 Added abilty to set build info
build info is displayed at startup
Fixes #1410
2014-09-10 16:07:00 +01:00
madmaxoft 022f5f141d Fixed Bindings regeneration under MSVC. 2014-09-01 16:10:40 +02:00
Mattes D e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D 8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02:00
Mattes D e553d58eaf Merge pull request #1308 from mc-server/logger
New Logging framework
2014-08-15 07:20:37 +02:00
madmaxoft 45068f9bf4 Merge branch 'master' into Ranks 2014-08-14 01:04:01 +02:00
madmaxoft 008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Tycho 9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Tycho be780b380e Fixed Tools to work with new logging framework 2014-08-10 20:10:47 +01:00
Tycho 806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
madmaxoft 40e15c5ad5 RankMgr: Initial interface declaration. 2014-08-05 18:37:00 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft 4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.
The cache is persisted into a SQLite DB file on server shutdown.
2014-07-30 13:56:29 +02:00
archshift 1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
madmaxoft c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
madmaxoft ba8cb3b0a6 Fixed MSVC bindings regeneration.
Still one typo had been left in the cmake file.
2014-07-22 23:33:08 +02:00
madmaxoft 5194eef07d CMake: generates a list of all source files.
This will be used for the style-checking script.
2014-07-21 17:40:44 +02:00
madmaxoft 9e7958e7fb Fixed MSVC bindings generation. 2014-07-19 13:22:16 +02:00
archshift 0960e6ae8f Moved Windows custom command to src/CMakeLists.txt 2014-07-18 19:53:47 -07:00
archshift 135dc333c1 CMakeLists: Moved Bindings-specific code to subdir 2014-07-18 19:05:51 -07:00
archshift 3d368b015e Blocks/CMakeLists.txt: Fixed header list after merge of master 2014-07-18 17:41:44 -07:00
archshift 8325304693 CMake: Add Bindings library from subdirectory 2014-07-18 17:41:44 -07:00
archshift 84fef3c156 src/CMakeLists.txt: Replaced glob with list of files
On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list.
2014-07-18 17:41:44 -07:00
archshift 34c8ff7b24 src/CMakeLists: Small changes for increased readability 2014-07-18 17:41:43 -07:00
archshift e824cd09b3 Merge remote-tracking branch 'origin/master' into potions
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Mattes D 7e3b26e7ba Merge pull request #1144 from mc-server/LuaCodeGen
Lua code gen
2014-07-06 14:44:52 +02:00
madmaxoft 78dd02f0c7 CMake: Changed slash format to support MSYS.
Ref.: #1044
2014-07-03 10:26:48 +02:00
madmaxoft 1c16862ae5 CMake: Use cmake for file-copying.
This should enable MSYS builds.
2014-07-02 16:30:45 +02:00
madmaxoft b6d5d50b31 Tolua generates LuaState_Call.inc file. 2014-07-01 22:29:39 +02:00
Mattes D 4f60f5aef4 Fixed linking order under MinGW.
Ref.: #1044
2014-07-01 06:40:38 +02:00
Mattes D 48639ee4d2 CMake: Added polarssl include dir as non-system. 2014-06-28 18:16:26 +02:00
Mattes D 3e104c25e9 Changed include folders to work for Bindings, too. 2014-06-28 12:49:08 +02:00
Mattes D d7bc5c5bd3 Added PolarSSL dependency to Bindings. 2014-06-27 20:23:05 +02:00
Mattes D 563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
archshift f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift 87b1bfaf2a Moved Effects.h to EntityEffects.h, added initial impl 2014-06-17 11:17:32 -07:00
Mattes D f1e3010839 Fixed bindings generation for Win64 builds.
Fixes #1092.
2014-06-14 15:47:37 +02:00
Mattes D af981cc718 Fixed MSVC Bindings generation. 2014-06-14 15:00:57 +02:00
worktycho d5a99d5b78 Remove windows bindings crutch 2014-06-14 13:48:12 +01:00
tycho 9254666a85 automaticlly build tolua and generate bindings as part of build. 2014-06-12 18:00:53 +01:00
madmaxoft 0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
archshift cc39d314ae Fixed ToLua issues 2014-04-26 17:58:06 -07:00
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
madmaxoft e33573ab59 Attempted CMake inclusion for PolarSSL++. 2014-04-24 21:53:42 +02:00
madmaxoft 0f1087b7d5 Added Prefabs to *nix builds. 2014-03-28 22:04:59 +01:00
madmaxoft 5b7215ec24 Initial NetherFortGen import.
Simple fortresses of 2 different rooms will generate.
2014-03-28 16:42:32 +01:00
Tycho 90ab055eab Merge branch 'master' into unreachable 2014-03-17 09:44:34 -07:00
Tycho 2e9fe777e4 Patched tolua to emit range checks for enums 2014-03-15 06:45:26 -07:00
Howaner 8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner 7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
andrew 9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +02:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
worktycho 6b153a5014 Move env code part 1 2014-03-07 19:59:49 +00:00
Tycho 72697cfb4f Added support to overide CMake build type with env vars 2014-03-07 11:23:28 -08:00
Howaner c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
andrew 68b75f7b7a Manually exported g_Block tables 2014-03-02 11:12:29 +02:00
Mattes D 87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Tiger Wang 6788dbe7f2 Properly exported and documented paintings 2014-02-18 11:37:45 +00:00
Howaner 777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
madmaxoft de7bf126db Added LuaChunkStay to Bindings sources.
This should fix *nix compilation. Also alpha-sorted the lists.
2014-02-10 23:23:04 +01:00
madmaxoft 4bcaf302b9 Added AllToLua.pkg to MSVC project files.
MSVC ignores the file when compiling and it makes it easier to open it up for editing.
2014-02-09 16:22:49 +01:00