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

196 Commits

Author SHA1 Message Date
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
Howaner
84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
Howaner
bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
madmaxoft
fd4ee20b2a Hotfixed compilation problems. 2014-07-27 23:15:51 +02:00
Mattes D
0814a977f8 Merge pull request #1236 from Howaner/Inventory2 
Fix item durability.
 2014-07-27 21:39:39 +02:00
Howaner
c2a2aea9f8 Derp. 2014-07-26 17:09:59 +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
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
Tiger Wang
3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01:00
Howaner
396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
Tiger Wang
18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves 
Conflicts:
	src/Defines.h
 2014-07-22 18:30:31 +01: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
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
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
archshift
f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
465743757a Items/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
Howaner
eeacb6f222 Added a extra wall sign handler. 
Fixes #1119
 2014-07-18 02:19:30 +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
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
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +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
madmaxoft
64c8b0d51b Reformatted cItemPotionHandler. 2014-07-17 10:51:44 +02:00
madmaxoft
e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02: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
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Tiger Wang
f0187cc8f9 Fixed placing liquids over liquids 
* Fixes #1182
 2014-07-14 21:55:46 +01:00
archshift
40bb98510a ItemHandler.cpp: removed redundant food and drink checks 2014-07-14 13:46:43 -07:00
archshift
061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tycho
2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
945dfe75d7 Comment grammar correction 2014-07-12 22:52:45 +01:00
Tiger Wang
9f4348fb09 Simplified buckets code slightly 2014-07-12 22:50:28 +01:00
Tiger Wang
084dec6ccf Merge pull request #1162 from daniel0916/Fixes 
Fix for bucket placing
 2014-07-12 22:09:50 +01:00
daniel0916
68668d7a6e Changes 2014-07-12 12:44:59 +02:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
daniel0916
ca6bcacdb9 Changes 2014-07-11 17:58:35 +02:00
daniel0916
a8efb62088 Changes 2014-07-10 17:46:07 +02:00
daniel0916
944c04a209 Maybe fixed whitespaces 2014-07-10 16:38:19 +02:00
daniel0916
47ceb9e79d Maybe fixed whitespaces 2014-07-10 16:36:28 +02:00
daniel0916
a11ad977ce Fixed Bucket Placing 2014-07-10 16:10:42 +02:00
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions 
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
 2014-07-09 23:28:27 -07:00
Tiger Wang
da1d946b2b Fixed bow charge 2014-07-09 22:04:26 +01:00
daniel0916
98950af634 Fixed Bucket placing 2014-07-09 16:53:01 +02:00
Howaner
64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00