Mattes D
|
2bfe7b76a1
|
Merge pull request #1261 from mc-server/issue850
Continuation of #966: Adding E_METAs
|
2014-10-11 22:08:37 +02:00 |
|
Alexander Harkness
|
6af9d5ba01
|
Fixed compilation.
|
2014-10-11 18:39:46 +01:00 |
|
Alexander Harkness
|
93833069a8
|
Merge branch 'master' into issue850
Conflicts:
src/BlockID.h
|
2014-10-11 18:32:21 +01:00 |
|
Alexander Harkness
|
99efaa5a3c
|
More README changes.
|
2014-10-11 17:19:08 +01:00 |
|
Alexander Harkness
|
ae0705a67d
|
Fixes.
|
2014-10-11 17:17:22 +01:00 |
|
Alexander Harkness
|
d9a50dd2ee
|
Fixed remaining indent and replaced tiger with webfreak.
|
2014-10-11 17:15:38 +01:00 |
|
Alexander Harkness
|
2f66e986bd
|
Merge pull request #1531 from win32re/patch-1
More template changes.
|
2014-10-11 17:13:21 +01:00 |
|
win32re
|
0c4894b99e
|
Update template.html
|
2014-10-11 18:11:56 +02:00 |
|
win32re
|
59efc7cfd2
|
Fixed indentation.
|
2014-10-11 18:07:10 +02:00 |
|
Alexander Harkness
|
faa8e721d5
|
Reverted submodule changes.
|
2014-10-11 17:03:30 +01:00 |
|
Alexander Harkness
|
68762747e0
|
Fixed typo and removed useless right side up slab meta.
|
2014-10-11 16:59:13 +01:00 |
|
win32re
|
9bb2b43e9e
|
More template changes.
|
2014-10-11 17:57:56 +02:00 |
|
Alexander Harkness
|
af67a0033a
|
Merge pull request #1528 from kjanku1/master
Android strings translated to polish
|
2014-10-11 16:48:31 +01:00 |
|
Alexander Harkness
|
d1a5abec89
|
Merge pull request #1530 from win32re/patch-1
Update template.html
|
2014-10-11 16:42:59 +01:00 |
|
win32re
|
d3f31b5046
|
Update template.html
|
2014-10-11 17:40:33 +02:00 |
|
Kamil Janku
|
040be609ff
|
Update strings.xml
|
2014-10-11 16:14:20 +02:00 |
|
worktycho
|
1a07dc897d
|
Fix lambda capture
|
2014-10-11 14:43:06 +01:00 |
|
kjanku1
|
a36f18fb49
|
Android strings transladed to polish
|
2014-10-11 14:22:55 +02:00 |
|
tycho
|
473c0425d3
|
Moved a few objects to unique_ptr
|
2014-10-10 15:33:19 +01:00 |
|
Mattes D
|
a47d9e5334
|
Fixed MSVC compilation.
|
2014-10-10 09:58:54 +02:00 |
|
archshift
|
ae5d311609
|
Merge pull request #1376 from mc-server/static_cast
Use static casts instead of C casts, add floor-cast functions
|
2014-10-09 15:12:51 -07:00 |
|
archshift
|
76b37acb42
|
Float/Ciel: If it's going to use C++11, it might as well take advantage of it
|
2014-10-09 14:57:57 -07:00 |
|
archshift
|
f8d1e96ae7
|
Use static casts instead of C casts, add floor-cast functions
|
2014-10-09 14:57:40 -07:00 |
|
Mattes D
|
f91aa6f1d3
|
DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
|
2014-10-09 12:33:42 +02:00 |
|
Mattes D
|
386068a5ad
|
Merge pull request #1520 from mc-server/c++11switch
Enabled C++11 in gcc
|
2014-10-09 12:02:58 +02:00 |
|
worktycho
|
c3479f7557
|
Fix flag name in gcc 4.6 and earlier
|
2014-10-09 10:07:58 +01:00 |
|
worktycho
|
5cf1ba092e
|
Enabled C++11 in gcc
|
2014-10-09 09:53:16 +01:00 |
|
Mattes D
|
b77d721daa
|
Merge pull request #1519 from mc-server/submodulize
Submodulize some more plugins.
|
2014-10-08 22:29:58 +02:00 |
|
Mattes D
|
30292c8112
|
Merge pull request #1518 from mc-server/AcaciaTrees
Added AcaciaTrees for the savanna biomes
|
2014-10-08 22:29:03 +02:00 |
|
Alexander Harkness
|
01f7ff303d
|
Reordered .gitmodules. Fixes #496
|
2014-10-08 21:14:02 +01:00 |
|
Alexander Harkness
|
fa00cbeda3
|
Added MagicCarpet
|
2014-10-08 21:13:38 +01:00 |
|
Alexander Harkness
|
27e69f32c6
|
Removed MagicCarpet
|
2014-10-08 21:13:10 +01:00 |
|
Alexander Harkness
|
ccbd5ba6a2
|
Added Handy.
|
2014-10-08 21:11:09 +01:00 |
|
Alexander Harkness
|
3b68949cc9
|
Added ChatLog
|
2014-10-08 21:08:21 +01:00 |
|
Alexander Harkness
|
8f625867f7
|
Removed ChatLog.
|
2014-10-08 21:07:55 +01:00 |
|
Alexander Harkness
|
ce11888851
|
Added chunkWorx.
|
2014-10-08 21:05:24 +01:00 |
|
Alexander Harkness
|
de41e2a04c
|
Removed ChunkWorx
|
2014-10-08 21:04:26 +01:00 |
|
STRWarrior
|
e95ee55974
|
Added comments to the GetAcaciaTreeImage function
|
2014-10-08 21:32:09 +02:00 |
|
STRWarrior
|
36fa1c5c73
|
Using array with possible directions.
|
2014-10-08 21:25:59 +02:00 |
|
STRWarrior
|
68a54c90c9
|
Added AcaciaTrees for the savanna biomes
|
2014-10-08 20:31:16 +02:00 |
|
Alexander Harkness
|
20f2d80c59
|
Updated Buildserver URLs.
|
2014-10-08 17:25:14 +01:00 |
|
Howaner
|
fec509935d
|
Removed BlockHaybale.h from CMakeLists.txt
|
2014-10-07 15:39:24 +02:00 |
|
Howaner
|
e3a69a527d
|
Removed unused cBlockHayBaleHandler.
|
2014-10-07 15:02:51 +02:00 |
|
Mattes D
|
2a32dd2740
|
Merge pull request #1513 from mc-server/MojangAPIRefresh
cMojangAPI: Added periodical refreshes.
|
2014-10-07 11:23:49 +02:00 |
|
madmaxoft
|
4e82a58060
|
Fixed crash in ForEachEntityInBox API.
Fixes #1511.
|
2014-10-06 13:48:44 +02:00 |
|
Mattes D
|
75003e1537
|
Merge pull request #1509 from WebFreak001/master
Made WebAdmin more modern
|
2014-10-06 10:46:46 +02:00 |
|
Mattes D
|
3d2d8a096b
|
cMojangAPI: Added periodical refreshes.
|
2014-10-06 10:05:02 +02:00 |
|
Mattes D
|
89713e23e4
|
Merge pull request #1510 from mc-server/TimedEvent
Added a cEvent::Wait() with timeout.
|
2014-10-06 09:24:51 +02:00 |
|
worktycho
|
a20bd0dbbd
|
Update CMakeLists.txt
|
2014-10-05 23:44:55 +01:00 |
|
madmaxoft
|
c94e82980e
|
Fixed a missed value.
|
2014-10-05 22:56:56 +02:00 |
|