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
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
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
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
madmaxoft
cd1e6f8ef0
Fixed formatting for cWitherSkullEntity
2014-07-17 10:24:29 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
Tiger Wang
960fcaa90c
Fixed a bug with buckets
...
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
2014-07-16 22:22:00 +01:00
Tiger Wang
9194438fb5
Fixed another redstone simulator crash
2014-07-16 22:21:00 +01:00
Mattes D
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang
c5d00f3ec5
Suggestions
2014-07-16 12:05:09 +01:00
Tiger Wang
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
Tiger Wang
ad247735fd
Function rename
2014-07-16 11:23:26 +01:00
Tiger Wang
f2c4f56ccd
Unified functions
...
Thanks @Howaner!
2014-07-16 11:21:02 +01:00
Tiger Wang
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
Tiger Wang
1df5a1f237
Fixed a DropSpenser AddFace bug
2014-07-15 22:53:44 +01:00
madmaxoft
3f8ec7699f
Merge remote-tracking branch 'origin/master' into potions
2014-07-15 22:42:00 +02:00
madmaxoft
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
Tiger Wang
74155f947c
Merge pull request #1191 from Masy98/Blocks
...
Removed stairs and carpet from IsSolid
2014-07-15 21:09:41 +01:00
Masy98
b579451731
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:34:49 +02:00
Masy98
d272e46821
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:32:49 +02:00
Howaner
74b6bf01a9
Derp.
2014-07-15 18:33:28 +02:00
