archshift
34d6f0713e
Added mutton, which sheep now drop when killed
2014-09-02 23:21:08 -07:00
Howaner
d3b8100a7b
Merge branch 'master' into Effects
2014-09-02 20:03:42 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
Howaner
0fdb177208
Fixed potion removing in creative mode.
2014-08-30 12:46:26 +02:00
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
Jaume Aloy
596203e692
Fixes
...
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Jaume Aloy
d3fd63c9eb
Added some Enchantments
...
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
archshift
d2d0ffee21
Fixed unsigned long comparison to size_t
2014-08-04 19:43:33 -07:00
Howaner
2e43eaaba7
Changed arrow comment.
2014-08-04 22:30:13 +02:00
Howaner
434ea542e1
Added arrow consuming on shooting
2014-08-04 21:48:33 +02:00
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
Howaner
64f6ddf1e2
Fix server-crash with non-existing items.
2014-07-01 14:47:49 +02:00
Tiger Wang
61cb08b546
Implemented tripwire(s) (hooks)
...
* Fixes #944
2014-06-28 20:44:34 +01:00
Howaner
eaf36766f6
Merge branch 'master' into Bow
2014-06-26 15:49:53 +02:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
archshift
f5529e544c
EntityEffects.x -> EntityEffect.x, Object-Oriented effects
...
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift
9e8361976b
Entity Effects: Clarified user, added it to AddEntityEffect
...
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7
Changed the AddEntityEffect() params for easier calls.
2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c
Fixed MSVC compilation.
2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
68011a004a
Removed long function wrapping
2014-06-17 11:39:20 -07:00
archshift
3766ac96d7
ItemHandler: changed IsDrinkable() to take a short argument
2014-06-17 11:39:20 -07:00
archshift
a1a8b7c0ee
Splash potion: Adjusted speed, fixed spawn position
2014-06-17 11:39:20 -07:00
archshift
73cea7065d
Entity effect type: use 'eff' as a prefix instead of 'ef'
2014-06-17 11:39:20 -07:00
archshift
58f35af6e7
Added splash potion functionality
2014-06-17 11:39:20 -07:00
archshift
2185c72c2c
Implemented drinkable potions, noeffect entity effect,
...
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
archshift
2123173202
Player: Removed food-poisoning-specific code, set duration to 30 seconds
...
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
Howaner
c60ba8a52d
Merge branch 'master' into GlobalFixes
2014-06-17 19:03:56 +02:00
Howaner
a1fd0b0335
Split Broadcast Sound Effect function call in multiple lines.
2014-06-16 23:41:23 +02:00
Howaner
b45e85a678
This isn't needed
2014-06-16 22:57:27 +02:00
Howaner
885a50d77a
Fix bow sound and creative arrow pickup.
2014-06-16 22:57:13 +02:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Howaner
e7a7c45c36
Add throw sound and fix arrow server crash.
2014-05-28 16:39:59 +02:00
andrew
07baf9bdd3
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
2014-05-20 15:52:59 +03:00
Mattes D
d1b719885d
Merge pull request #989 from Howaner/Anvil
...
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Howaner
f5fe368220
Merge branch 'master' into Slabs
2014-05-07 12:54:58 +02:00
Howaner
d6cb6e0423
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.
2014-05-07 12:30:30 +02:00
Mattes D
66c5c81e02
Merge pull request #985 from Howaner/Anvil
...
Add anvil inventory.
2014-05-06 21:46:50 +02:00
Howaner
954b59d6f4
Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()
2014-05-06 19:38:09 +02:00
Tiger Wang
1df7dbe7c9
Suggestions'd
2014-05-05 23:45:35 +01:00
Howaner
3c102870f6
Add anvil window and slot area.
2014-05-05 17:34:17 +02:00
madmaxoft
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
madmaxoft
5c7876c2dd
Added a sanitizer for Spawn egg damage value.
...
This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928 .
2014-05-02 19:13:57 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
archshift
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
archshift
0e0c9d8248
Missed these CMakeLists.
2014-04-25 12:24:09 -07:00
Howaner
ccd9023202
Add commit what the code is doing.
2014-04-25 00:10:52 +02:00
Howaner
cee70390fa
Add unkown armor warning and fix armor stacks.
2014-04-25 00:09:22 +02:00
Howaner
376dc880b3
Add armor to switch() in ItemHandler.cpp
2014-04-24 23:03:04 +02:00
Howaner
9cbb3a339f
Fix armor in survival mode.
2014-04-24 20:41:25 +02:00
Tiger Wang
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang
f763242e5c
Small changes
2014-04-23 21:06:07 +01:00
jfhumann
5bed1c09bc
Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.
2014-04-18 22:47:59 +02:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
Howaner
7da308a7e1
Merge branch 'master' into Slabs
2014-04-06 21:43:23 +02:00
Howaner
039191499c
Add CanChangeDirtToGrass function to Block Handlers.
2014-04-06 21:41:01 +02:00
madmaxoft
402d85d896
Fixed Clang warnings in itemhandlers.
2014-04-04 09:56:57 +02:00
madmaxoft
5c6d474599
Fixed boat placement code.
2014-04-02 16:40:28 +02:00
Tiger Wang
a87bd5788f
Another curly
2014-03-30 13:07:28 +01:00
Tiger Wang
519bd0b989
Curly brackets
2014-03-28 23:51:52 +00:00
Tiger Wang
79aa082b04
Fixed infinite minecart items
2014-03-28 22:52:23 +00:00
Tiger Wang
283a66bcae
Some fixes to lilypads
...
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
2014-03-28 22:51:30 +00:00
Tiger Wang
f622f4317c
Implemented lilypad placement
2014-03-23 22:32:45 +00:00
Tiger Wang
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Mattes D
dc77cbfdc4
Merge pull request #809 from Howaner/BlockEntitys
...
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6
Add new leaves to all classes.
2014-03-16 21:38:57 +01:00
Howaner
4ec5a95a7a
Add cake
2014-03-16 20:26:13 +01:00
Howaner
8316ae330e
Merge branch 'master' into BlockEntitys
2014-03-15 02:46:18 +01:00
Howaner
ccc29c7c6c
Add fireball interact
2014-03-14 23:52:51 +01:00
Tiger Wang
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238
Merge branch 'master' into awesometnt
2014-03-10 18:36:55 +00:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tycho
c3758112cc
Merge branch 'master' into warnings
2014-03-08 07:13:45 -08:00
Howaner
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
andrew
6679641b9e
cBlockInfo-related changes from #723
2014-03-08 12:53:15 +02:00
Tycho
b480148116
Fixed warnings
2014-03-07 10:26:07 -08:00
Tiger Wang
53231bebd6
Added extra awesomeness to TNT
...
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
madmaxoft
1826461884
Fixed multiple gcc warnings about unused params.
2014-02-28 16:26:23 +01:00
madmaxoft
9c6d72a023
Fixed crash and some warnings in map handling.
...
Fixes #728 .
2014-02-27 09:06:25 +01:00
Tiger Wang
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
STRWarrior
9440b61c8c
Fixed MCServer not compiling with C++03 compilers
2014-02-24 14:43:46 +01:00
andrew
f471873945
Maps: Improvements
2014-02-23 15:05:03 +02:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
Mattes D
87db4b6a90
Merge pull request #697 from Howaner/Skull
...
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
Tiger Wang
a686656253
Merge branch 'master' into itemframes
...
Conflicts:
src/Entities/Entity.h
src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Tiger Wang
5b961453d1
Fixed possible ASSERT failure
2014-02-18 21:54:53 +00:00
Tiger Wang
05789f9e66
Changed BlockFace type to eBlockFace
2014-02-18 21:33:33 +00:00
Howaner
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
andrew
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
Tiger Wang
7a23e27fc5
Added an explanatory comment
2014-02-18 00:29:10 +00:00
Tiger Wang
ced6eb971d
Comments & new BLOCK_FACE constants
2014-02-18 00:28:31 +00:00
Tiger Wang
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
Tiger Wang
7c0d11fbb2
Used new BLOCK_FACE constants
...
Also added more comments
2014-02-17 23:38:25 +00:00
