1
0
Commit Graph

7550 Commits

Author SHA1 Message Date
Howaner
d93acb841f Fixed m_SentChunks list chunk removing. 2014-10-30 22:04:04 +01:00
Mattes D
30db6d9852 Merge pull request #1576 from mc-server/QtBiomeVisualiserThreadedGen
QtBiomeVisualiser: Generator uses all machine threads.
2014-10-30 12:22:15 +01:00
Mattes D
4e0cef0ff6 QtBiomeVisualiser: Generator uses all machine threads.
The previous limit of 1 thread was lifted, now the generator source runs on all CPU threads available.
2014-10-29 23:04:59 +01:00
Mattes D
d898fb904b Merge pull request #1575 from mc-server/1.8-Item
Fixed 1.8 world item format reading.
2014-10-29 22:35:16 +01:00
Howaner
165533c27e Fixed 1.8 world item format reading. 2014-10-29 15:47:43 +01:00
Mattes D
48ac3acc84 QtBiomeVisualiser: Added quick shutdown to region loaders.
Now the app shuts down immediately even if regions are queued for loading.
2014-10-28 22:19:24 +01:00
Mattes D
3168a95404 QtBiomeVisualiser: Fixed mouse zoom vs menu zoom. 2014-10-28 22:15:42 +01:00
Mattes D
2f0abb73c9 Merge pull request #1574 from mc-server/QtBiomeVisualiserRegions
QtBiomeVisualiser: Switched caching to entire regions.
2014-10-28 22:07:09 +01:00
Howaner
373b139ed6 Forgotten m_SendChunksMediumPriority.empty() check. 2014-10-28 21:32:01 +01:00
Mattes D
bea2edb2a9 QtBiomeVisualiser: Reduced memory usage. 2014-10-28 20:52:04 +01:00
Mattes D
3f3a2a6755 QtBiomeVisualiser: Fixed random regions not rendered. 2014-10-28 20:49:29 +01:00
Mattes D
6a1a76e73d Merged remote-tracking branch 'origin/master'. 2014-10-28 19:42:35 +01:00
Mattes D
d6c663cbc5 QtBiomeVisualiser: Fixed compilation on Linux. 2014-10-28 15:44:58 +01:00
Mattes D
53ff5c527c QtBiomeVisualiser: Attempt at fixing Linux compilation. 2014-10-28 11:23:54 +01:00
Mattes D
2d7cbfe620 Merge pull request #1573 from mc-server/warningfixes
Fixed some more warnings.
2014-10-28 00:44:48 +01:00
Mattes D
c53b7e5d38 QtBiomeVisualiser: Switched caching to entire regions.
This speeds up the rendering preparation for small zooms.
2014-10-27 23:58:09 +01:00
Alexander Harkness
232343065f Fixed compile (typos). 2014-10-27 22:03:11 +00:00
Alexander Harkness
dbe7c8b170 Comment alignment. 2014-10-27 21:38:00 +00:00
Alexander Harkness
a4932bbd8b CheckBasicStyle'd 2014-10-27 21:34:02 +00:00
Alexander Harkness
b67eb2169e Another one.# 2014-10-27 20:16:51 +00:00
Alexander Harkness
7de8757ac9 Fixed more warnings.
It's ugly though.
2014-10-27 20:05:34 +00:00
Alexander Harkness
59ca542c28 Another switch. 2014-10-27 19:53:16 +00:00
Alexander Harkness
0cdf262053 Fix missing biomes in enum. 2014-10-27 19:52:04 +00:00
Alexander Harkness
6e21897bc6 Fixed remaining warnings. 2014-10-27 19:49:52 +00:00
Alexander Harkness
c0a9a83abf Actually fixed the warning. 2014-10-27 18:09:34 +00:00
Alexander Harkness
8a443c028f Test warning fix. 2014-10-27 17:11:31 +00:00
Alexander Harkness
cbb637187e Fixed typo. 2014-10-27 16:46:30 +00:00
Alexander Harkness
11a80b5d09 Pocess? 2014-10-27 16:46:17 +00:00
Alexander Harkness
cede90a231 Merge pull request #1568 from mc-server/TypedBlocktypes
Added type to block type enum.
2014-10-26 15:11:54 +00:00
Mattes D
aff537e714 Added type to block type enum. 2014-10-26 10:13:43 +01:00
Mattes D
2e8f2c5b3a APIDump: Added basic projectile documentation. 2014-10-25 21:27:27 +02:00
Alexander Harkness
a4d4641f58 shorter easy-install command 2014-10-25 16:37:23 +01:00
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D
e272637ff5 IniFile: Removed the problematic printf-like Set function.
It wasn't used in any client code anyway.
2014-10-24 08:49:36 +02:00
archshift
dd86c1f4a3 OSSupport/CMakeLists.txt: fixed indentation 2014-10-23 23:49:20 -07:00
worktycho
d5dfacae87 Fixed formatstring 2014-10-23 23:23:34 +01:00
archshift
8ccb729504 Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE. 2014-10-23 15:03:54 -07:00
archshift
6bcc2c187a Fix linking on OS X, which does not have librt. 2014-10-23 14:58:42 -07:00
Mattes D
f6ddafabd6 Re-updated Core. 2014-10-23 22:50:42 +02:00
Mattes D
4df924cf4b Merge pull request #1500 from mc-server/ChunkLoader
Optimized chunk loader
2014-10-23 22:49:17 +02:00
Howaner
9af58a81d6 Use 3 priorities. 2014-10-23 21:19:43 +02:00
Mattes D
32cab75e43 IniFile: Removed an unused macro. 2014-10-23 16:07:43 +02:00
Mattes D
298be25413 QtBiomeVisualiser: Moved the IniFile lib. 2014-10-23 15:29:02 +02:00
Mattes D
1235ccb1e2 Removed iniFile library from linux dependencies. 2014-10-23 15:26:43 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
2014-10-23 14:59:42 +02:00
Mattes D
07bbfd5894 Fixed a crash in redstone simulator. 2014-10-23 12:51:59 +02:00
Mattes D
154c329a25 Removed the "conditional expression is constant" warning.
MSVC spits out many of these on its own std libraries.
2014-10-23 10:58:41 +02:00
Mattes D
ed7a0332f6 Merge pull request #1562 from mc-server/signplace
Signs can be placed on wallsigns.
2014-10-23 09:46:51 +02:00
Alexander Harkness
57f822cd0e Signs can be placed on wallsigns.
Fixes #1438
2014-10-23 08:07:20 +01:00