Mattes D
8422ada77f
Fixed return value description in doxycomment.
2015-12-23 14:17:04 +01:00
Mattes D
44d2f37e7b
Merge pull request #2802 from mathias-github/master
...
Added 1.7 item names
2015-12-23 11:17:16 +01:00
Mathias
a72318bbc3
Added 1.7 item names
2015-12-22 23:19:35 +02:00
Julian Laubstein
3389b234ae
Merge pull request #2800 from cuberite/rconbuild-fix
...
Removed offending tr1 references.
2015-12-22 21:19:13 +01:00
Alexander Harkness
16d0bc10a4
Removed offending tr1 references.
2015-12-22 19:55:00 +00:00
Safwat Halaby
7a8b50f8d1
Merge pull request #2790 from Gargaj/waterbottle
...
Add handling of water bottle
2015-12-22 21:43:55 +02:00
Gargaj
8968a7174e
add handling of water bottle
2015-12-22 20:25:59 +01:00
Alexander Harkness
2b27bf9f22
Merge pull request #2796 from cuberite/MojangCert
...
Added GeoTrust Root Certificate
2015-12-22 16:39:09 +00:00
worktycho
76cd723867
Added GeoTrust Root Certificate
2015-12-22 16:08:02 +00:00
worktycho
ecb94e0dc6
Ignore == if followed by \
...
Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n.
2015-12-22 16:08:02 +00:00
Safwat Halaby
d112632d6a
Merge pull request #2788 from SafwatHalaby/jump
...
PF - Improved mob jumping
2015-12-22 07:42:28 +02:00
Safwat Halaby
f33b44d777
Merge pull request #2791 from then0rTh/master
...
cTeam:GetName returning wrong name
2015-12-21 23:25:59 +02:00
then0rTh
4d264b8b33
cTeam:GetName returning wrong name
2015-12-21 20:25:33 +01:00
Safwat Halaby
8b4530740e
PF - Improved mob jumping
2015-12-21 20:00:25 +02:00
Safwat Halaby
e6d74553a2
Merge pull request #2786 from SafwatHalaby/revert
...
Revert "Changed cPath to have a reset method".
2015-12-21 17:37:19 +02:00
Safwat Halaby
b4874d213c
Revert "Changed cPath to have a reset method".
2015-12-21 16:47:43 +02:00
Mattes D
e95a716ba0
Merge pull request #2783 from cuberite/seadragon91-patch-spawnpoint-fix
...
Fixed spawn point generation. Wrong number for divisions and wrong highest spawn point
2015-12-20 17:22:26 +01:00
Lukas Pioch
938833bd6b
Fixed spawn point. Wrong number for divisions and wrong highest spawn point.
2015-12-20 13:05:43 +01:00
Lukas Pioch
27d6789a83
Merge pull request #2780 from cuberite/SpawnRace
...
Fix race condition
2015-12-20 01:51:05 +01:00
tycho
d4289eee3c
Fix race condition
2015-12-20 00:56:55 +01:00
worktycho
bb79b5f436
Merge pull request #2779 from cuberite/seadragon91-patch-clang-3.7
...
Fixes for clang-3.7
2015-12-19 22:17:31 +00:00
Lukas Pioch
50a908fdc9
Fixes for clang-3.7
2015-12-19 22:43:37 +01:00
Alexander Harkness
01bd614b86
HTTPS Newsletter
2015-12-19 21:29:00 +00:00
Tiger Wang
b8752bb26e
Merge pull request #2542 from Haxi52/pinkstone
...
Reorganised the redstone simulator
2015-12-19 21:20:56 +00:00
Lukas Pioch
60dec884e4
Merge pull request #2776 from cuberite/AtomicBoolIsthread
...
Use atomic bool for isthread terminate
2015-12-19 20:17:29 +01:00
tycho
d01562cb7d
Use atomic bool for isthread terminate
2015-12-19 19:29:06 +01:00
Alexander Harkness
f764df1a3a
Merge pull request #2778 from cuberite/httpschanges
...
Added HTTPS links wherever they are supported.
2015-12-19 14:51:20 +00:00
Alexander Harkness
8b851d5048
Added HTTPS links wherever they are supported.
2015-12-19 14:30:32 +00:00
Lukas Pioch
a99c82323e
Merge pull request #2774 from cuberite/worktycho-patch-1
...
Fix off by two error in ReadString
2015-12-18 17:08:29 +01:00
worktycho
1ee61c4f23
Fix off by two error in ReadString
2015-12-18 15:53:41 +00:00
Alexander Harkness
05e39b249b
Merge pull request #2769 from cuberite/FastNBTAsserts
...
Check for invalid tags when reading a compound tag
2015-12-18 14:40:23 +00:00
tycho
456253c651
Check for invalid tags when reading a compound tag
2015-12-18 15:20:24 +01:00
Mattes D
749274aa43
Merge pull request #2759 from cuberite/ExplosionAPI
...
Revised the explosion-related Lua API and docs.
2015-12-18 14:32:01 +01:00
Tiger Wang
5b62c4c314
Reorganised the redstone simulator
...
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
2015-12-18 13:17:38 +00:00
Mattes D
086c8b1834
Revised the explosion-related Lua API and docs.
...
Fixes #2746 .
2015-12-18 12:40:34 +01:00
Mattes D
dae27fa9ec
Merge pull request #2770 from cuberite/RemoveChunkDataCollector
...
Removed unused class cChunkDataCollector.
2015-12-18 12:39:52 +01:00
Mattes D
d135e49451
Removed unused class cChunkDataCollector.
2015-12-18 12:24:47 +01:00
Mattes D
c8de191e4d
Merge pull request #2758 from cuberite/FastNBTFix
...
Fixed String Parsing crash bug
2015-12-18 12:24:05 +01:00
tycho
9e6161305d
Fixed String Parsing crash bug
...
Check string length against actual remaining data, not an abitary constant
2015-12-18 12:08:55 +01:00
Mattes D
eb87214f6d
Merge pull request #2755 from cuberite/coverage
...
Working coverage build
2015-12-18 12:03:29 +01:00
tycho
91d0abae4c
Working coverage build
2015-12-18 11:19:21 +01:00
Mattes D
a7d0abcdc1
Merge pull request #2751 from cuberite/PieceStructuresFix
...
PieceStructures generator: Fixed wrong merge conflict resolution.
2015-12-17 19:33:28 +01:00
Mattes D
f060d9f9b0
PieceStructures generator: Fixed wrong merge conflict resolution.
...
Also improved reporting messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=2256
2015-12-17 19:33:12 +01:00
Lukas Pioch
1395ff3ca4
Merge pull request #2761 from cuberite/fixed_warnings
...
Moved variables into scope, removed unused variables and fixed variables
2015-12-17 11:37:20 +01:00
Lukas Pioch
d620dcdd08
Moved variables into scope, removed unused variables and fixed variables
2015-12-17 10:48:36 +01:00
Safwat Halaby
3c1f9e8a3a
Merge pull request #2753 from cuberite/pathFix
...
Path fix
2015-12-16 18:39:23 +02:00
tycho
2c0ca0b4c3
Changed cPath to have a reset method.
...
Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak"
This reverts commit 1515d37684
2015-12-16 10:49:42 +00:00
worktycho
83418e1d7a
Merge pull request #2754 from Gargaj/horsefix
...
Allow horse control
2015-12-15 21:53:23 +00:00
Gargaj
68ff0edfde
allow horse control (still quite buggy)
2015-12-15 21:14:27 +01:00
tycho
0fb8646198
Delete copy and move constructors from cPath
...
cPath is not safe to copy or move due to pointers into the std::map m_Map.
2015-12-15 19:18:58 +00:00
