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 |
|
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
|
0346ab15ad
|
Debuggers: Optimized and commented the /rmitem handler.
|
2014-07-18 23:51:15 +02:00 |
|
madmaxoft
|
abe8a6bd45
|
APIDump: Documented RemoveItem().
|
2014-07-18 23:48:06 +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 |
|