f78bf254e3
Merge pull request #1234 from mc-server/GeneratorTweaks
...
ExtremeHillsPlus and ExtremeHills spawn with grass only
2014-07-22 14:20:06 -07:00
4044d0a6e6
Export SendEntityAnimation to ToLua
2014-07-22 13:10:12 -07:00
bc5db3274f
Fix misguided comment on bits...
...
...obviously written by someone very confused, also known as me
2014-07-22 21:09:37 +01:00
9045246e74
Export BroadcastEntityAnimation with ToLua
...
Fixes #752
2014-07-22 13:02:28 -07:00
b5e5586ab0
Merge pull request #1216 from mc-server/saplingsandleaves
...
Fixed issues relating to saplings and leaves
2014-07-22 20:10:02 +01:00
18a0b60c12
Merge remote-tracking branch 'origin/master' into saplingsandleaves
...
Conflicts:
src/Defines.h
2014-07-22 18:30:31 +01:00
5b148c30f7
Extreme Hills M variant only spawn with grass and stone
...
Removed gravel.
2014-07-22 14:44:26 +02:00
31b22e14b7
Updated prefabs to current Gallery content.
2014-07-22 10:04:53 +02:00
bea574bf54
ExtremeHillsPlus and ExtremeHills spawn with grass only
...
Turns out only the M variants have stone and gravel in them.
2014-07-21 18:53:56 +02:00
7672418ca8
Merged branch 'origin/Foliage'.
2014-07-21 18:18:54 +02:00
dd0ab04481
Defines.h: Fixed a warning.
2014-07-21 18:07:51 +02:00
63cc008340
CheckBasicStyle: Added a lua shebang.
2014-07-21 17:57:50 +02:00
26ad3dbee4
CheckBasicStyle: Doesn't require LuaFileSystem.
...
Instead it uses the list of files generated by CMake.
2014-07-21 17:40:45 +02:00
5194eef07d
CMake: generates a list of all source files.
...
This will be used for the style-checking script.
2014-07-21 17:40:44 +02:00
9e7b9a4ebe
Normalized spaces after "catch".
2014-07-21 17:40:44 +02:00
fe6a3b5d72
CheckBasicStyle: Checks spaces after keywords, no space before ")".
2014-07-21 17:40:43 +02:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
39623251c4
Fixed a missing enter.
2014-07-21 16:34:35 +02:00
ce956bcdf2
Removed y for-loop.
...
Only the top block now gets long grass.
2014-07-21 16:01:16 +02:00
0c816dd697
Fixed indentation
2014-07-21 10:58:13 +02:00
8593d48579
Cuboid: added explicit copy assignment operator
2014-07-20 15:01:15 -07:00
a4470da876
Changed CubicNoiseXX to IntNoiseXX
...
Added some comments
2014-07-20 22:43:31 +02:00
b41bd2da5c
Merge pull request #1213 from mc-server/chat-color
...
Refactored cChatColor
2014-07-20 20:36:08 +02:00
76b79b51ad
Renamed cFinishGenFoliage to cFinishGenTallGrass
...
Better grass density
Added double tall grass.
2014-07-20 19:22:41 +02:00
51ad6cd1b2
Fixed warnings
2014-07-20 16:31:28 +02:00
7bf9da7441
First attempt for a new foliage finisher
2014-07-20 16:23:45 +02:00
2823ee9026
Revert "Only one instance of server can be started"
...
This reverts commit 6484e9814aFixes #1200
2014-07-20 13:49:15 +01:00
ba24f50e5e
Line tracer invalid chunk fix
...
* Fixes #1230
* Additionally improved speed in some scenarios
2014-07-20 13:39:14 +01:00
d0e7b2f18b
Merge branch 'master' into saplingsandleaves
...
Conflicts:
src/Bindings/DeprecatedBindings.cpp
src/Blocks/BlockSapling.h
2014-07-20 12:02:23 +01:00
f68b04e029
Proper comment for DropBlock()
2014-07-20 12:00:20 +01:00
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07:00
88c877f79c
Merge pull request #1231 from mc-server/ticks-alive
...
Added m_TicksAlive to entities and allows projectiles to hit their creators
2014-07-20 10:39:25 +01:00
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
9e155c6add
Added destroy-timer system to splash potion entities
2014-07-20 01:38:36 -07:00
0e608b2844
Merge pull request #1227 from mc-server/fixes
...
Fixed a couple warnings
2014-07-20 01:46:04 +02:00
14826b6606
main.cpp: field style fixes
2014-07-19 15:44:19 -07:00
638ea10027
ChatColor.h: The @deprecated tag slipped. Oops.
2014-07-19 15:28:55 -07:00
1831c2e652
Socket: removed unused Socket destructor
2014-07-19 14:50:31 -07:00
ed01e12ed7
main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED
2014-07-19 14:50:01 -07:00
ada88a5805
Monsters: Made IsUndead overridable by the respective mob classes
2014-07-19 14:35:35 -07:00
52add840cf
Fixed attempts to call c_str on ChatColors
2014-07-19 11:15:21 -07:00
d5b163bd3d
Removed references to deprecated cChatColor::Color
2014-07-19 11:12:34 -07:00
dd7df28844
Refactored cChatColor
...
- Changed std::string fields to const char-pointers in order to wipe out potential issues with static initialization and global destructors
- Deprecated cChatColor::Color() because the name does not match the value
2014-07-19 11:09:39 -07:00
e612d07eea
CheckBasicStyle: Checks for braces not on separate lines.
...
Only the opening braces at the end of a line are checked, others (such as inline getters and setters or initializers) are valid.
2014-07-19 15:25:28 +02:00
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
822d83009d
CheckBasicStyle: Check spaces around commas.
...
We want no space in front of and at least one space after a comma.
2014-07-19 15:08:49 +02:00
1cb26bda8e
Fixed spaces after commas in protocol data.
...
The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
2014-07-19 15:07:28 +02:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift
Tiger Wang
STRWarrior
madmaxoft