1
0
Commit Graph

4761 Commits

Author SHA1 Message Date
Arnaud Meuret
e19109465d Fix typo (ammount) 2016-01-02 22:02:02 +01:00
Mattes D
80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed.
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
Mattes D
6c9be8df4b Fixed default Nether generator params.
The prefab file is "NetherFort"
2015-12-30 13:37:28 +01:00
Mattes D
0054104017 Fixed problems in cBlockingSslClientSocket. 2015-12-30 13:00:02 +01:00
Mattes D
902f428342 Fixed the monster burn code.
The old code failed when the monster was out of Y range.
2015-12-30 01:15:13 +01:00
Mattes D
78eb4c8ed8 Removed excessive logging in redstone simulator. 2015-12-28 11:06:41 +01:00
LogicParrot
fc8a117a0c Deleted cPath::BlockTypeIsFence 2015-12-27 16:13:44 +02:00
Safwat Halaby
bfafc39576 Merge pull request #2814 from SafwatHalaby/chunk2
Freeze player until chunk is loaded
2015-12-26 21:08:12 +02:00
worktycho
b99b60720a Merge pull request #2820 from cuberite/UrlParser
Added the cUrlParser class, exported to Lua API.
2015-12-26 19:01:37 +00:00
Mattes D
958df6ad91 Added the cUrlParser class, exported to Lua API. 2015-12-25 18:50:25 +01:00
Safwat Halaby
687d1816c4 Update fences and gates list
Update fences and gates list
2015-12-25 19:19:22 +02:00
Safwat Halaby
400f875918 Freeze player until chunk is loaded 2015-12-25 17:47:06 +02:00
Safwat Halaby
6a22605fae Merge pull request #2795 from SafwatHalaby/doors
"Special blocks" handling
2015-12-25 15:03:39 +02:00
Safwat Halaby
b4649248d1 Nether and End in settings.ini by default, and created at startup 2015-12-25 13:49:13 +02:00
Safwat Halaby
87b2d60a0e Merge pull request #2816 from SafwatHalaby/redstone
Silenced the Redstone Simulator console spam
2015-12-24 18:57:34 +02:00
Safwat Halaby
75fea3cd1e Silenced the Redstone Simulator console spam 2015-12-24 17:58:34 +02:00
Mattes D
122d824a8a Added a Json parser and serializer to Lua API. 2015-12-24 14:00:31 +01:00
Safwat Halaby
dfeced18b2 PF - "Special blocks" handling 2015-12-24 06:20:16 +02:00
Julian Laubstein
d319c9dd58 Added IsBlockFence method to defines 2015-12-24 00:05:49 +01:00
Julian Laubstein
2713577dbf Fixed builds on FreeBSD 32bit 2015-12-23 17:13:47 +01:00
Safwat Halaby
7285a43cf6 Merge pull request #2806 from SafwatHalaby/gargraj-chicken
[Gargaj] - Baby chickens don't lay eggs
2015-12-23 16:31:35 +02:00
Safwat Halaby
1ccf7d9c8a Chicken egg code early bailout 2015-12-23 15:57:26 +02:00
Gargaj
fd2edf3ecf Baby chickens don't lay eggs 2015-12-23 15:54:07 +02:00
Mattes D
8422ada77f Fixed return value description in doxycomment. 2015-12-23 14:17:04 +01:00
Gargaj
8968a7174e add handling of water bottle 2015-12-22 20:25:59 +01: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
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
b4874d213c Revert "Changed cPath to have a reset method". 2015-12-21 16:47:43 +02:00
Lukas Pioch
938833bd6b Fixed spawn point. Wrong number for divisions and wrong highest spawn point. 2015-12-20 13:05:43 +01:00
tycho
d4289eee3c Fix race condition 2015-12-20 00:56:55 +01:00
Lukas Pioch
50a908fdc9 Fixes for clang-3.7 2015-12-19 22:43:37 +01:00
Tiger Wang
b8752bb26e Merge pull request #2542 from Haxi52/pinkstone
Reorganised the redstone simulator
2015-12-19 21:20:56 +00:00
tycho
d01562cb7d Use atomic bool for isthread terminate 2015-12-19 19:29:06 +01:00
Alexander Harkness
8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
worktycho
1ee61c4f23 Fix off by two error in ReadString 2015-12-18 15:53:41 +00:00
tycho
456253c651 Check for invalid tags when reading a compound tag 2015-12-18 15:20:24 +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
d135e49451 Removed unused class cChunkDataCollector. 2015-12-18 12:24:47 +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
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
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
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
Julian Laubstein
5af10b8cd3 Fixed warning regarding an uninitialized value 2015-12-15 17:20:34 +01:00