1
0
Commit Graph

7916 Commits

Author SHA1 Message Date
Mattes D
58fe37814b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-11-06 08:55:33 +01:00
Lukas Pioch
2915ef5bdb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-11-05 21:58:21 +01:00
Lukas Pioch
13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Alexander Harkness
dc401e6ff4 Merge pull request #1587 from Ambushed91/WebAdmin
Update V1.0.3
2014-11-05 19:37:09 +00:00
Ambushed91
0fa8c881a6 Update V1.0.9
Removed Time, Scroll-Able Header, Resized contention
2014-11-05 14:20:03 +01:00
Ambushed91
eab829ee37 Update V1.0.3
WebAdmin Fixes
2014-11-05 13:45:15 +01:00
Mattes D
5dbf601824 cEvent: Changed chrono duration resolution. 2014-11-04 15:56:27 +01:00
Mattes D
0d15261601 cEvent: Changed steady_clock to system_clock. 2014-11-04 15:47:55 +01:00
Mattes D
6201b3602c Merge branch 'master' into c++11Events 2014-11-04 15:45:08 +01:00
Mattes D
74aef9ea64 WebAdmin: Fixed login template destination address. 2014-11-04 15:22:53 +01:00
Mattes D
dd75330d1e Merge remote-tracking branch 'ambushed/WebAdmin' 2014-11-04 14:54:00 +01:00
Mattes D
7d2b2f90b6 MinMax heigen: Reduced the number of octaves.
They didn't affect the terrain that much anyway.
2014-11-04 08:41:18 +01:00
Mattes D
f239a28d06 Added MinMax height generator.
Fixes #1578.
2014-11-04 08:40:23 +01:00
Arian
8604978d50 Update template.lua 2014-11-04 00:17:14 +01:00
Mattes D
c5f3663bea Fixed a missing endline. 2014-11-03 11:48:03 +01:00
Mattes D
f5c4a6a27d Added a (disabled) perf test for biome generators. 2014-11-03 10:36:12 +01:00
Mattes D
ca29683738 HeiGen: Moved construction to the end of file.
This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
2014-11-03 08:17:19 +01:00
Lukas Pioch
269d76a208 Simplified FindAndDoWithUUID, formatted line 2014-11-02 21:38:17 +01:00
Lukas Pioch
9f71a4e7ae Added FindAndDoWithUUID 2014-11-02 21:01:23 +01:00
Mattes D
325e94709e Merge pull request #1569 from mc-server/GrownBiomes
Grown biomes
2014-11-02 17:01:51 +01:00
Mattes D
dbed5c0726 Grown biomes: fixed Linux build. 2014-11-02 16:47:56 +01:00
Mattes D
d5b6353493 Grown biomes: Unified with GrownProt biomes.
Also fixed a Zoom filter randomness.
2014-11-02 16:36:59 +01:00
Alexander Harkness
42364cb81e Fixed it yet again. 2014-11-02 10:42:19 +00:00
Alexander Harkness
e5a2b6d9d6 Files found. 2014-11-02 10:27:39 +00:00
Alexander Harkness
cde5d51d18 Use screen instaead. 2014-11-02 10:17:09 +00:00
Alexander Harkness
b9f467571c Added nohup. 2014-11-02 10:09:38 +00:00
Mattes D
65b5ae0aa2 CMake: Added a C++11 check for VS.
VS2010- cannot be used, VS2012 needs to have a 2012-CTP compiler installed, VS2013+ has all the features we need.
2014-11-02 08:09:22 +01:00
Mattes D
d868346491 GrownProt: Added the rest of rare and M biomes. 2014-11-01 21:01:33 +01:00
Alexander Harkness
91d03bd215 Fixed wrong url. 2014-11-01 16:31:06 +00:00
Alexander Harkness
2736a11bef Added DO easy-install 2014-11-01 16:00:44 +00:00
Mattes D
4873890cfb GrownProt biome gen: Added biome edges. 2014-11-01 16:37:56 +01:00
Alexander Harkness
01eb2608e0 Merge pull request #1580 from mc-server/doinstall
Create app.yml
2014-11-01 14:51:29 +00:00
Alexander Harkness
01c45a2f4c Create app.yml 2014-11-01 14:51:02 +00:00
Mattes D
0dd804a591 Merge branch 'master' into GrownBiomes 2014-10-31 19:27:35 +01:00
Mattes D
2b7f34515a cLuaState: Fixed errors on non-existent callbacks.
This mostly affected table-based callbacks, such as the cLineBlockTracer. If a callback didn't exist, the code would still push its arguments on the stack, breaking the next callback.
2014-10-31 19:25:45 +01:00
Mattes D
e2ffd5429c Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea(). 2014-10-31 19:25:44 +01:00
Alexander Harkness
ce2439fd1b Update README.md 2014-10-31 13:43:15 +00:00
Mattes D
13f0e93d69 GrownProt biomes: added alterations. 2014-10-31 12:52:07 +01:00
Mattes D
c6e8da893e QtBiomeVisualiser: Fixed default zoom selection. 2014-10-31 12:26:12 +01:00
Howaner
d93acb841f Fixed m_SentChunks list chunk removing. 2014-10-30 22:04:04 +01:00
Howaner
415c0e128e ... in this world 2014-10-30 21:38:32 +01:00
Howaner
9c7661f50f Added a MaxViewDistance option. 2014-10-30 21:24:10 +01:00
Mattes D
f25e268ca0 QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST. 2014-10-30 16:54:23 +01:00
Mattes D
8c04abf9aa QtBiomeVisualiser: Added a prototyping int generator flavor.
This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
2014-10-30 16:24:35 +01:00
Mattes D
93f33b7d4e Merge remote-tracking branch 'origin/master' into GrownBiomes 2014-10-30 12:50:55 +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
f34b1291be Grown biomes: made biomes smaller, made beaches smaller. 2014-10-29 15:28:27 +01:00