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 |
|