1
0
Commit Graph

170 Commits

Author SHA1 Message Date
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
madmaxoft
a2dfb28537 Merged branch 'master' into ChangeToPolarSSL. 2014-01-25 15:37:00 +01:00
Alexander Harkness
6b51c62d78 Merge pull request #586 from worktycho/BindingsMove
Implented xofts suggestions in #577
2014-01-25 05:53:01 -08:00
Tycho
45bc1ff033 Added dependecy output to Bindings/BindingsDependencies.txt 2014-01-25 05:35:04 -08:00
Tycho
b2fd91ee6b Reformatted Bindings Dependecies 2014-01-25 05:25:43 -08:00
madmaxoft
e75f979e01 Fixed Win nightbuilds not producing PDBs. 2014-01-24 10:24:24 +01:00
madmaxoft
98976de071 Merge branch 'master' into ChangeToPolarSSL. 2014-01-23 23:46:51 +01:00
madmaxoft
5f34c78091 PolarSSL is fully used for 1.3.2 protocol encryption. 2014-01-23 23:35:23 +01:00
Tycho
b95e005d91 Make clean now effects Bindings 2014-01-23 11:06:42 -08:00
Tycho
ce2fb844aa Removed Bindings folder subcmake on *nix 2014-01-23 11:03:49 -08:00
Tycho
27d1d5d491 Bugfixes 2014-01-23 11:00:36 -08:00
Tycho
e0956be0a7 added dependecies for bindings regen 2014-01-23 10:41:08 -08:00
madmaxoft
eb9bebf755 Replacing CryptoPP with PolarSSL.
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
2014-01-22 22:19:33 +01:00
Tycho
80f2f21f4c Changed std to c++11 in clang to fix va_copy issues 2014-01-17 10:10:31 -08:00
madmaxoft
dab37db562 CMake: Fixed output paths for all MSVC versions. 2014-01-16 18:33:28 +01:00
madmaxoft
b263d55a2d CMake: Added postfix for profiled exe 2014-01-14 09:32:43 +01:00
madmaxoft
0a3fae7c35 CMake: Removed leftover debugging output. 2014-01-13 17:22:01 +01:00
madmaxoft
89e641071e CMake: Added resources to windows projects. 2014-01-13 17:15:34 +01:00
madmaxoft
2ca06cc213 CMake generates Bindings when not existant (win) 2014-01-12 17:20:29 +01:00
madmaxoft
4b54f3e3ea Output dir set to $/MCServer.
Ref.: #510.
2014-01-06 10:13:19 +01:00
madmaxoft
a1211bcdff Added support for out-of-source builds. 2013-12-28 14:42:11 +01:00