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
Tiger Wang
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
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
Mattes D
0e608b2844
Merge pull request #1227 from mc-server/fixes
...
Fixed a couple warnings
2014-07-20 01:46:04 +02: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
Mattes D
e9a9bbf02e
Merge pull request #1224 from mc-server/fixes-potions
...
Fix for potion color after tossing
2014-07-19 13:29:50 +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
