archshift
3ffec92e79
Removed unused cPlayer::FoodPoison function
2014-08-02 22:27:27 -07:00
archshift
7915c4ca7c
Entity.cpp: On portal check, use if-else for current dimension
...
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07:00
STRWarrior
a44fbf2338
Added proper trees and height for SwamplandM biome
2014-08-02 21:44:16 +02:00
Howaner
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
Tiger Wang
b5c0a4aa3a
Fixed issues with autocomplete and time loading
...
* Fixes #1274
2014-08-01 22:15:34 +01:00
Tiger Wang
c865fc8ca5
Improved endermen code a little
2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
Howaner
bfe11024ac
Added missing HOOK_BLOCK_SPREAD call.
2014-08-01 19:37:08 +02:00
Mattes D
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Mattes D
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner
86d84bcb73
Compile fix.
2014-08-01 17:29:17 +02:00
Howaner
160fa3a9a9
Import Statistics.h
2014-07-31 23:56:49 +02:00
Mattes D
a9317ac372
Merge pull request #1270 from Howaner/Options
...
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
2014-07-31 23:45:01 +02:00
Mattes D
bc1cfd5942
Merge pull request #1271 from Howaner/GlobalFixes
...
Fixed water from ice and removed packed ice drop.
2014-07-31 23:37:37 +02:00
Tiger Wang
1094d91fba
Merge pull request #1047 from mc-server/Enderman
...
Enderman attacks a player if he's looking at him
2014-07-31 22:20:05 +01:00
Howaner
09b63565bc
Use "default:" in switch.
2014-07-31 23:19:05 +02:00
madmaxoft
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
Howaner
cfaef0de38
Capitalised "incremental"
2014-07-31 23:11:51 +02:00
Howaner
87d195171a
Changed IsSolid to FullyOccupiesVoxel
2014-07-31 23:08:08 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
madmaxoft
70fd7caf1f
Removed trailing whitespace.
2014-07-31 22:54:45 +02:00
madmaxoft
ecb86935f8
Fixed UUIDs handling in cPlayer.
...
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
Tiger Wang
ffd6797fe1
Comment suggestions
2014-07-31 18:17:21 +01:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
Howaner
f47765dcbd
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.
2014-07-31 18:21:45 +02:00
Howaner
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
madmaxoft
59adf113f0
MojangAPI: Moved the settings to a separate ini section.
2014-07-31 17:22:48 +02:00
Howaner
c49d4fd215
Updated documentation.
2014-07-31 12:15:18 +02:00
Howaner
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
madmaxoft
8b519bf6e2
MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().
2014-07-31 10:02:50 +02:00
Howaner
e6ca5a5ece
Added window update.
2014-07-30 22:54:19 +02:00
Howaner
dcd226d904
Added beacon load/save.
2014-07-30 22:50:34 +02:00
STRWarrior
7821326370
Suggestions
2014-07-30 22:43:59 +02:00
Howaner
ad4fa6eba8
Changed return type from GetPrimaryPotion() and GetSecondaryPotion()
2014-07-30 22:22:06 +02:00
Howaner
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
Howaner
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
STRWarrior
6e0a8d393b
Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage
2014-07-30 21:56:33 +02:00
STRWarrior
f232ef5cd6
Fixed doxy comment
2014-07-30 21:50:02 +02:00
STRWarrior
fd2d338a25
Fixed comment at the end of a for-loop
2014-07-30 21:42:48 +02:00
STRWarrior
c4e6a14235
Added lighting code and added comments
2014-07-30 19:18:11 +02:00
madmaxoft
0336e12cee
MojangAPI: Renamed cache file to MojangAPI.sqlite.
2014-07-30 17:09:41 +02:00
STRWarrior
17b679f355
Fixed compiling using Clang
2014-07-30 17:09:00 +02:00
STRWarrior
5249f574bd
Added RoofedForest trees.
...
Could still be improved allot.
2014-07-30 15:55:50 +02:00
madmaxoft
85d64d291a
MojangAPI: Clarified the UUID conversion code.
2014-07-30 14:09:30 +02:00
madmaxoft
426773df17
ManualBindings: Fixed alignment.
2014-07-30 14:03:14 +02:00
STRWarrior
5daeba7e88
Removed lighting code in cEnderman::CheckEventSeePlayer
2014-07-30 13:59:47 +02:00
madmaxoft
17a94b16ea
MojangAPI: Implemented UUID shortening and dashing.
2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e
Exported cMojangAPI to Lua.
2014-07-30 13:56:29 +02:00
madmaxoft
4dd858f899
Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.
...
The cache is persisted into a SQLite DB file on server shutdown.
2014-07-30 13:56:29 +02:00
STRWarrior
75b7c37755
PreSimulator: Added configurations.
...
You can now choose if it should pregenerate something or not
2014-07-30 13:06:48 +02:00
madmaxoft
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
archshift
1d68469718
Fixed "Dependency" typos
2014-07-29 22:43:25 -07:00
Mattes D
b41c8b5de7
Merge pull request #1262 from mc-server/CanBeTerraformed
...
Added cBlockInfo::CanBeTerraformed and made finishers use it
2014-07-30 07:09:33 +02:00
madmaxoft
7022ae7988
Fixed FinishGen.h types.
2014-07-30 07:08:29 +02:00
archshift
487c572429
Entity.h: Moved constants out of some unnamed enum
2014-07-29 19:14:56 -07:00
Howaner
438e4088d6
Changed size_t to 'unsigned long'
2014-07-30 01:22:51 +02:00
Howaner
9a4d80fc3b
Fixed compile error with clang.
2014-07-30 00:45:03 +02:00
STRWarrior
931443ac67
Added soulsand to the terraformed list.
2014-07-29 22:40:40 +02:00
STRWarrior
adae2b70b1
Added cBlockInfo::CanBeTerraformed and made finishers use it
...
I might have forgotten some of them though
2014-07-29 22:31:31 +02:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Mattes D
30e64ed4d8
Merge pull request #1061 from mc-server/portals
...
Portals and others
2014-07-29 17:48:56 +02:00
Mattes D
d715eb7f5e
Merge pull request #1254 from mc-server/SingleTopBlockFinisher
...
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
2014-07-29 17:47:40 +02:00
Mattes D
8287f2d933
Merge pull request #1252 from mc-server/RoughRavinesGen
...
Rough ravines gen
2014-07-29 17:46:57 +02:00
Tiger Wang
cb77b39dc6
Detrailed whitespace
2014-07-29 16:36:24 +01:00
STRWarrior
4ccf14f3b3
Some finishing touches
...
Removed whitespace
fixed dead bush comment
2014-07-29 17:01:15 +02:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
STRWarrior
c8c01b055d
Fixed comment above cFinishGenSingleTopBlock
2014-07-29 15:24:11 +02:00
STRWarrior
57bb03148a
SingleTopBlock: All blocktypes and biometypes get initialized properly
2014-07-29 13:13:23 +02:00
madmaxoft
1acd03f96f
Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.
2014-07-28 17:09:39 +02:00
STRWarrior
e74984675c
Using suggestions
2014-07-28 16:53:01 +02:00
STRWarrior
579f850506
Forgot Mesa Plateau biome.
2014-07-28 14:28:16 +02:00
STRWarrior
bf1aa79932
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
...
Now accepts a vector of biomes and a vector of allowed blocks.
2014-07-28 14:23:29 +02:00
madmaxoft
f5f9656917
cAuthenticator: Added GetUUIDsFromPlayerNames().
2014-07-28 12:37:48 +02:00
STRWarrior
5b69b2ce4f
DistortedHeightmap: Now generates gravel in deep ocean.
2014-07-28 12:30:16 +02:00
madmaxoft
fd4ee20b2a
Hotfixed compilation problems.
2014-07-27 23:15:51 +02:00
Howaner
2bdc2701f4
Change Group->SetColor() again.
2014-07-27 21:58:00 +02:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00
Howaner
3d73040327
Use AString(1, Color[0])
2014-07-27 21:14:45 +02:00
STRWarrior
d61f1d0f4a
NetherClumpGenerator: Fixed generating stuff on halfslabs and fences
2014-07-27 20:48:39 +02:00
Howaner
9be92fa71d
Use Color[0].
2014-07-27 20:44:00 +02:00
madmaxoft
579b80fd3a
Added a missing include for abs(float).
2014-07-27 20:08:33 +02:00
madmaxoft
003f0e69a9
Updated NetherForts' weights.
2014-07-27 20:04:55 +02:00
madmaxoft
30893e7ee2
RoughRavines: Made floor and ceiling settings-adjustable.
...
The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
2014-07-27 19:57:47 +02:00
madmaxoft
960ab982b9
RoughRavines: Added per-height radius modifier. Ledges!
2014-07-27 16:05:45 +02:00
STRWarrior
3addd4890c
Removed forgotten comment
2014-07-27 14:04:34 +02:00
STRWarrior
bfad1be567
Made nether ceiling smooth.
2014-07-27 14:03:23 +02:00
madmaxoft
472f70a676
RoughRavines: More settings - size, width, roughness
2014-07-27 13:54:27 +02:00
Howaner
7f9f46c911
Fixed group color's.
2014-07-27 13:47:21 +02:00
STRWarrior
fe7018bd00
Added a ceiling to disguise the bedrock above it.
2014-07-27 13:12:45 +02:00
STRWarrior
50fc1a5469
NetherClumpFoliage: Fixed assert
2014-07-27 11:59:54 +02:00
Howaner
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
madmaxoft
ce54936f01
Updated NetherFort prefabs to latest Gallery content.
2014-07-27 00:08:25 +02:00
madmaxoft
77f4297c6e
RoughRavines: Initial generator implementation.
...
This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
2014-07-27 00:03:26 +02:00
Howaner
f79e682664
Fixed plugin count and fixed plugin loading, when settings.ini was regenerated.
2014-07-27 00:03:00 +02:00
Howaner
c2a2aea9f8
Derp.
2014-07-26 17:09:59 +02:00
Mattes D
56f4174943
Merge pull request #1232 from mc-server/splash-entity
...
Moved potion static functions to EntityEffect to create splash potions through the world
2014-07-26 16:47:11 +02:00
Howaner
6e2025d125
Change comment.
2014-07-26 13:29:25 +02:00
Howaner
ef4d68adfd
Merge branch 'master' into Inventory
2014-07-26 13:27:27 +02:00
Howaner
4de8f5ca29
Rename function.
2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift
16e0beb5b6
SplashPotionEntity: Use const cItem &
instead of a cItem
2014-07-26 03:55:40 -07:00
archshift
60d4a16514
Fixed indentations, removed redundant init code in SplashPotionEntity.cpp
2014-07-26 03:48:16 -07:00
archshift
0298d34406
Moved potion static functions to EntityEffect to create splash potions through world
2014-07-26 03:48:16 -07:00
archshift
1595ef73dc
Endianness.h: undefined ntohll before redefining
2014-07-26 03:42:42 -07:00
STRWarrior
a39e19e94a
Tweaks to NetherClumpFoliage
...
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
2014-07-25 21:01:40 +02:00
STRWarrior
0f298c8b84
Speed up the NetherClumpFoliage finisher.
...
Using IntNoiseXX instead of CubicNoiseXX.
2014-07-25 14:23:36 +02:00
Tiger Wang
d3012d6904
Merge remote-tracking branch 'origin/master'
2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b
Fixed block drops
...
* Fixes #1242 (the issue addressed within)
2014-07-24 21:38:25 +01:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
madmaxoft
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
STRWarrior
9678341a11
Made the cWorld::SpawnMobFinalize function more readable.
2014-07-24 12:15:48 +02:00
Tiger Wang
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
tonibm19
997a643977
Moar view distance!
...
Let's blow up our computers! :D
2014-07-23 20:28:56 +02:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
STRWarrior
7e38c123fc
TallGrass: Less grass on mountains.
2014-07-23 11:23:35 +02:00
STRWarrior
9080f14dc2
Fixed possible crash in the NetherClumpFoliage finisher.
2014-07-23 11:02:42 +02:00
madmaxoft
dfadcf7453
BlockLeaves: Fixed comment style.
2014-07-23 09:12:06 +02:00
madmaxoft
ba8cb3b0a6
Fixed MSVC bindings regeneration.
...
Still one typo had been left in the cmake file.
2014-07-22 23:33:08 +02:00
madmaxoft
e171285408
Fixed Bindings generation in MSVC.
...
The bindings weren't regenerated because of the typo in the dependencies cmake variable.
2014-07-22 23:29:23 +02:00
archshift
f78bf254e3
Merge pull request #1234 from mc-server/GeneratorTweaks
...
ExtremeHillsPlus and ExtremeHills spawn with grass only
2014-07-22 14:20:06 -07:00
archshift
4044d0a6e6
Export SendEntityAnimation to ToLua
2014-07-22 13:10:12 -07:00
Tiger Wang
bc5db3274f
Fix misguided comment on bits...
...
...obviously written by someone very confused, also known as me
2014-07-22 21:09:37 +01:00
archshift
9045246e74
Export BroadcastEntityAnimation with ToLua
...
Fixes #752
2014-07-22 13:02:28 -07:00
Tiger Wang
18a0b60c12
Merge remote-tracking branch 'origin/master' into saplingsandleaves
...
Conflicts:
src/Defines.h
2014-07-22 18:30:31 +01:00
Tiger Wang
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
STRWarrior
5b148c30f7
Extreme Hills M variant only spawn with grass and stone
...
Removed gravel.
2014-07-22 14:44:26 +02:00
Tiger Wang
0a15e1f420
Suggestion and failed merge fix
2014-07-22 10:33:16 +01:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft
31b22e14b7
Updated prefabs to current Gallery content.
2014-07-22 10:04:53 +02:00
Tiger Wang
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
STRWarrior
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
madmaxoft
7672418ca8
Merged branch 'origin/Foliage'.
2014-07-21 18:18:54 +02:00
madmaxoft
dd0ab04481
Defines.h: Fixed a warning.
2014-07-21 18:07:51 +02:00
madmaxoft
63cc008340
CheckBasicStyle: Added a lua shebang.
2014-07-21 17:57:50 +02:00
madmaxoft
26ad3dbee4
CheckBasicStyle: Doesn't require LuaFileSystem.
...
Instead it uses the list of files generated by CMake.
2014-07-21 17:40:45 +02:00
madmaxoft
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
madmaxoft
9e7b9a4ebe
Normalized spaces after "catch".
2014-07-21 17:40:44 +02:00
madmaxoft
fe6a3b5d72
CheckBasicStyle: Checks spaces after keywords, no space before ")".
2014-07-21 17:40:43 +02:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
STRWarrior
39623251c4
Fixed a missing enter.
2014-07-21 16:34:35 +02:00
STRWarrior
ce956bcdf2
Removed y for-loop.
...
Only the top block now gets long grass.
2014-07-21 16:01:16 +02:00
STRWarrior
0c816dd697
Fixed indentation
2014-07-21 10:58:13 +02:00
archshift
8593d48579
Cuboid: added explicit copy assignment operator
2014-07-20 15:01:15 -07:00
STRWarrior
a4470da876
Changed CubicNoiseXX to IntNoiseXX
...
Added some comments
2014-07-20 22:43:31 +02:00
Mattes D
b41bd2da5c
Merge pull request #1213 from mc-server/chat-color
...
Refactored cChatColor
2014-07-20 20:36:08 +02:00
STRWarrior
76b79b51ad
Renamed cFinishGenFoliage to cFinishGenTallGrass
...
Better grass density
Added double tall grass.
2014-07-20 19:22:41 +02:00
STRWarrior
51ad6cd1b2
Fixed warnings
2014-07-20 16:31:28 +02:00
STRWarrior
7bf9da7441
First attempt for a new foliage finisher
2014-07-20 16:23:45 +02:00
Tiger Wang
2823ee9026
Revert "Only one instance of server can be started"
...
This reverts commit 6484e9814a
.
* Fixes #1200
2014-07-20 13:49:15 +01:00
Tiger Wang
ba24f50e5e
Line tracer invalid chunk fix
...
* Fixes #1230
* Additionally improved speed in some scenarios
2014-07-20 13:39:14 +01:00
Tiger Wang
d0e7b2f18b
Merge branch 'master' into saplingsandleaves
...
Conflicts:
src/Bindings/DeprecatedBindings.cpp
src/Blocks/BlockSapling.h
2014-07-20 12:02:23 +01:00
Tiger Wang
f68b04e029
Proper comment for DropBlock()
2014-07-20 12:00:20 +01:00
archshift
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07:00
Tiger Wang
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
archshift
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
archshift
9e155c6add
Added destroy-timer system to splash potion entities
2014-07-20 01:38:36 -07:00
Howaner
897d68dc35
Add armor items directly to the armor slots.
2014-07-20 01:22:58 +02:00
archshift
14826b6606
main.cpp: field style fixes
2014-07-19 15:44:19 -07:00
archshift
638ea10027
ChatColor.h: The @deprecated tag slipped. Oops.
2014-07-19 15:28:55 -07:00
archshift
1831c2e652
Socket: removed unused Socket destructor
2014-07-19 14:50:31 -07:00
archshift
ed01e12ed7
main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED
2014-07-19 14:50:01 -07:00
archshift
ada88a5805
Monsters: Made IsUndead overridable by the respective mob classes
2014-07-19 14:35:35 -07:00
archshift
52add840cf
Fixed attempts to call c_str on ChatColors
2014-07-19 11:15:21 -07:00
archshift
d5b163bd3d
Removed references to deprecated cChatColor::Color
2014-07-19 11:12:34 -07:00
archshift
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
madmaxoft
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
madmaxoft
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
madmaxoft
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
madmaxoft
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
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
Mattes D
c2aa7d78bf
Merge pull request #1223 from mc-server/fixes
...
Fixed small issues throughout the codebase
2014-07-19 13:31:35 +02:00
madmaxoft
9e7958e7fb
Fixed MSVC bindings generation.
2014-07-19 13:22:16 +02:00
archshift
11f8198a80
World.cpp: fixed not all enum fields being used in m_Dimension switch
2014-07-19 02:56:46 -07:00
archshift
7c861f98a2
Minecart: slimmed down SpawnOn by keeping subtype in the payload enum
2014-07-19 02:55:36 -07:00
archshift
f86eefa2ae
Trees.cpp: removed unused "debug" fields
2014-07-19 02:54:44 -07:00
archshift
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
archshift
93c6520e1e
Fixed splash potion color on toss
2014-07-19 02:46:31 -07:00
archshift
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
madmaxoft
c7b7938c04
Renamed AllToLua_lua script.
...
Fixes #1222 .
2014-07-19 09:57:23 +02:00
archshift
f94cf49980
Authenticator.cpp: Killed a global destructor warning
2014-07-18 21:38:55 -07:00
archshift
0960e6ae8f
Moved Windows custom command to src/CMakeLists.txt
2014-07-18 19:53:47 -07:00
archshift
135dc333c1
CMakeLists: Moved Bindings-specific code to subdir
2014-07-18 19:05:51 -07:00
archshift
3d368b015e
Blocks/CMakeLists.txt: Fixed header list after merge of master
2014-07-18 17:41:44 -07:00
archshift
8325304693
CMake: Add Bindings library from subdirectory
2014-07-18 17:41:44 -07:00
archshift
84fef3c156
src/CMakeLists.txt: Replaced glob with list of files
...
On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list.
2014-07-18 17:41:44 -07:00
archshift
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
archshift
34c8ff7b24
src/CMakeLists: Small changes for increased readability
2014-07-18 17:41:43 -07:00
archshift
dcaa3262a2
OSSupport/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
5d966be741
HTTPServer/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
de48688fdb
Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
0859ee3995
Simulator/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
9fe4b61df3
WorldStorage/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
06bef093bf
Generating/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
1a05b7c5d7
BlockEntities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
5890d04f21
UI/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
15aacc24a5
Protocol/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
61c4e2e5cb
Blocks/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
465743757a
Items/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
1d8e3e2bb8
Entities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
2f811fc6a2
Mobs/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
madmaxoft
76b33970b0
Merge branch 'Inventory2'
2014-07-18 23:51:36 +02:00
madmaxoft
13311c700f
Clarified RemoveItem()'s comments.
2014-07-18 23:47:46 +02:00
madmaxoft
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e
Fixed slime-related comments.
2014-07-18 23:20:42 +02:00
Howaner
51b91befbd
Added RemoveItem() function to the player inventory.
2014-07-18 23:11:59 +02:00
madmaxoft
749f073d70
Merge branch 'Sign'
2014-07-18 22:45:50 +02:00
madmaxoft
23037ce7ec
Normalized code style for both sign handlers.
2014-07-18 22:41:48 +02:00
Tiger Wang
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
Howaner
44c944716b
Removed cBlockSignPostHandler descend.
2014-07-18 17:04:01 +02:00
Howaner
509d3d3b62
Slime sizes are 1, 2 or 4 and not 1, 2 or 3.
2014-07-18 16:55:28 +02:00
Howaner
e32b0ce4fa
Moved comment.
2014-07-18 16:38:59 +02:00
Tiger Wang
f1be1eb674
Monster fixes
...
* Fixes #1203
* Fixes #627
2014-07-18 10:47:00 +01:00
archshift
9529a42559
Fixed creative players not being able to drink
...
Fixes #1215
2014-07-18 01:56:26 -07:00
madmaxoft
204b591172
CheckBasicStyle: Proper spaces with commas.
2014-07-18 09:58:29 +02:00
madmaxoft
2df5e26d3b
Fixed spaces before commas.
2014-07-18 09:57:34 +02:00
madmaxoft
d52a51f7b6
Removed duplicate IPvX labels.
2014-07-18 09:18:11 +02:00
Mattes D
35d0a0009e
Merge pull request #1208 from Howaner/MobInventory
...
Spawns skeletons with a bow in their hands
2014-07-18 09:06:59 +02:00
archshift
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
archshift
33b0a719da
ProtocolRecognizer.cpp: removed unused NumBytesRead
2014-07-17 18:39:44 -07:00
archshift
32b25ec7f7
Generator: removed rnd definitions that are never read
2014-07-17 18:34:47 -07:00
Howaner
eeacb6f222
Added a extra wall sign handler.
...
Fixes #1119
2014-07-18 02:19:30 +02:00
Howaner
33bd78dcdd
Skeletons should spawn with a bow in the hand.
...
Fixes #1184
2014-07-18 01:26:27 +02:00
Howaner
2e9aed793a
Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary.
2014-07-18 01:16:49 +02:00
Howaner
9c32e31edf
Items should first added to the first slot, not the latest.
2014-07-18 01:02:25 +02:00
archshift
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
Howaner
fba93aac2a
Split into more lines.
2014-07-17 23:32:01 +02:00
Tiger Wang
0f8c24e04d
Fixed issues relating to saplings and leaves
...
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
2014-07-17 22:26:53 +01:00
madmaxoft
b2716c720e
Fixed code style in Trees.cpp.
...
The src folder now has zero BasicStyle violations.
2014-07-17 23:25:21 +02:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
archshift
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
archshift
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
Howaner
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
madmaxoft
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +02:00
madmaxoft
a02509ff4b
Initial version of a script to check basic style.
...
This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes.
2014-07-17 22:19:52 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
Howaner
68cc9c6f91
Fix sapling drop.
2014-07-17 21:35:34 +02:00
madmaxoft
7fff12bfac
Fixed spaces around single-line comments.
...
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf
Fixed basic whitespace problems.
...
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
Tiger Wang
db36f1a9fa
Fixed crash with entities in unloaded chunks
...
* Fixes #1190
2014-07-17 13:54:28 +01:00
Tiger Wang
c3b4b70a73
Merge pull request #1183 from Howaner/Sounds
...
Reset meta to zero when the blocks explode
2014-07-17 10:39:38 +01:00
madmaxoft
70f304a96b
Fixed 3 MSVC warnings in SplashPotionEntity.
2014-07-17 11:07:33 +02:00
madmaxoft
430d8b42a5
Updated cPawn::KilledBy signature for custom death messages.
2014-07-17 11:07:10 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
madmaxoft
64c8b0d51b
Reformatted cItemPotionHandler.
2014-07-17 10:51:44 +02:00