flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,480 Commits 1 Branch 0 Tags 92 MiB
f095e770b8
Commit Graph

2723 Commits

Author SHA1 Message Date
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