1
0
Commit Graph

6404 Commits

Author SHA1 Message Date
Tiger Wang
e11f41d048 Revert failed fix for #31
This reverts commit 69dc9b4c9a.
2014-07-13 00:17:31 +01:00
Howaner
dc5c43c0aa Changed comments. 2014-07-13 01:04:43 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
Howaner
905fed09a6 Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) 2014-07-13 00:51:42 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01: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
madmaxoft
e2e0f52ecb cNBTChunkSerializer: Fixed alignment. 2014-07-12 23:48:39 +02:00
madmaxoft
d72a81cb8e cHopperEntity: Simplified chest conditions. 2014-07-12 23:34:32 +02:00
madmaxoft
c4f1284d9c cChestEntity: Renamed a member to avoid confusion. 2014-07-12 23:30:34 +02:00
madmaxoft
9ab0f259c7 Fixed alignment. 2014-07-12 23:25:59 +02:00
Tiger Wang
084dec6ccf Merge pull request #1162 from daniel0916/Fixes
Fix for bucket placing
2014-07-12 22:09:50 +01:00
Tiger Wang
e71e432633 Suggestions and bug fix
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
daniel0916
68668d7a6e Changes 2014-07-12 12:44:59 +02:00
archshift
8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
archshift
83c69134c0 Merge remote-tracking branch 'origin/master' into potions 2014-07-11 17:37:28 -07:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
madmaxoft
f73042fb02 Simplified the player data loading. 2014-07-11 23:12:57 +02:00
Tiger Wang
416c160fb5 Suggestions 2014-07-11 19:40:33 +01:00
daniel0916
ca6bcacdb9 Changes 2014-07-11 17:58:35 +02:00
Tiger Wang
6a33fa84ae Suggestions 2014-07-11 12:43:24 +01:00
madmaxoft
ebea2b7efc Player data filenames are based on UUID. 2014-07-11 13:13:10 +02:00
Tiger Wang
df65e8b7bb Improved LinkedPowering speed
* Additionally fixed wires powering other wires through blocks
2014-07-11 12:06:16 +01:00
madmaxoft
6cea81e383 Fixed a missing return value. 2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a Preparation for player UUID-based storage: LoadFromFile() 2014-07-11 00:06:05 +02:00
madmaxoft
729cc7f6ff Fixed style consistency. 2014-07-10 23:04:33 +02:00
madmaxoft
d790a45c50 APIDump: Documented cWorld:SetChunkAlwaysTicked.
Ref.: #1160
2014-07-10 18:28:20 +02:00
madmaxoft
3b7e0969b9 Debuggers: Added forced chunk ticking test.
Ref.: #1160
2014-07-10 18:19:05 +02:00
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +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
Mattes D
e4828f0072 Merge pull request #1159 from mc-server/VectorFloorFix
Vector floor fix
2014-07-10 12:59:02 +02:00
madmaxoft
db75989157 Fixed a missing "inline" keyword. 2014-07-10 12:46:09 +02:00
madmaxoft
ce670accc9 Fixed Vector3.h compilation in MSVC2008. 2014-07-10 12:37:21 +02:00
madmaxoft
a6d30a7254 Removed lilypad from plains village prefabs. 2014-07-10 12:27:08 +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
Mattes D
ea24a4f4aa Merge pull request #1157 from Howaner/Window
Add more inventory actions.
2014-07-09 23:27:02 +02:00
Tiger Wang
da1d946b2b Fixed bow charge 2014-07-09 22:04:26 +01:00
Tiger Wang
74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
daniel0916
98950af634 Fixed Bucket placing 2014-07-09 16:53:01 +02:00
Howaner
0d88e71d18 Removed unused include line. 2014-07-09 14:35:01 +02:00
Howaner
3615bf825b Added inventory number click. 2014-07-09 14:30:06 +02:00
Tiger Wang
372dbbb994 Merge pull request #1135 from mc-server/fixes
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
madmaxoft
f2419afac5 Updated generator prefabs to current Gallery contents. 2014-07-08 23:11:06 +02:00
Tiger Wang
164ffe50ad Made things consistent 2014-07-08 12:34:39 +01:00
Tiger Wang
7c7501abc5 Added extra space before comments 2014-07-07 21:14:15 +01:00
Tiger Wang
756c45d07b Fixed compilation and pressure plates 2014-07-07 21:12:25 +01:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00