flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
2,185 Commits 1 Branch 0 Tags 92 MiB
7ecd728f1e
Commit Graph

68 Commits

Author SHA1 Message Date
madmaxoft
4e200df18c Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes 
Conflicts:
	source/Blocks/BlockTorch.h
 2013-09-15 20:34:22 +02:00
Tiger Wang
fc3d5ff5a6 Torches work properly 
Also fixed a naming inconsistency concerning quartz stairs.
 2013-09-15 15:55:35 +01:00
madmaxoft
d31142811d Merged branch 'Projectiles'. 2013-09-07 22:06:30 +02:00
Tiger Wang
9c22cf1520 Fixed inconsistent meta naming 2013-09-03 12:33:54 +01:00
Tiger Wang
20b64e18e4 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	source/Bindings.cpp
	source/Entities/Entity.cpp

Updated from upsteam
 2013-09-02 14:15:28 +01:00
madmaxoft
0dec48d496 Added dtRangedAttack, fixed faulty StringTODamageType() 2013-09-01 20:06:49 +02:00
madmaxoft
42ea85786a Thrown ender pearls now teleport and hurt. 2013-08-30 23:48:03 +02:00
madmaxoft
17ad4c2610 Shooting a bow kinda works. 
The arrow is released, but sometimes hits wrong blocks or disappears completely.
 2013-08-30 14:24:03 +02:00
Tiger Wang
7056992d0d Implemented xoft's suggestions [SEE DESC] 
Rail metas are  now in BlockID and exported to LUA
Minecart now does a SetMass, instead of m_Mass
Minecarts use SubType instead of TypeType
 2013-08-29 13:47:22 +01:00
Tiger Wang
2081b6dfde Fixed inconsistent metas and added snow metas 2013-08-24 18:54:03 +01:00
Tiger Wang
9e0b8b5bee Enhancements to Tabcompletion and Compile Fix 
Tab complete now finds the last word and matches accordingly, with a 20%
increase in speed!
Fixed missing comma breaking compilation
 2013-08-18 11:58:19 +01:00
Tiger Wang
679085b520 Bugfix Update [SEE DESC} 
Added stained clay, coal block, and hardened clay Block IDs
Added stained clay and carpet block Metas
Fixed bug with sticky retract bailing out but not unsetting arm
Fixed autocomplete not working when not at the first character, fixes
#64
Added furnace recipes for hardened clay and coal and coal blocks
 2013-08-18 00:33:14 +01:00
Tiger Wang
cbde4f546a Merge remote-tracking branch 'upstream/master' 2013-08-16 11:25:53 +01:00
Tiger Wang
7f87d6c3d6 Feature and bugfixes [SEE DESC] 
Added TNT and Hopper minecarts
Fixed piston code failing without an extension set
Repeaters are now broken
Fixed not being able to place a minecart on an activator rail
Added much needed comments on piston code
Fixed minor formatting issue
 2013-08-16 11:23:24 +01:00
madmaxoft
0cb00996de Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. 
Also slightly improved the spawning algorithm.
 2013-08-16 10:48:30 +02:00
madmaxoft
cce9642c7b Fixed wrong names for some metas. 
They were E_BLOCK_ instead of E_META_.
 2013-08-14 19:49:53 +02:00
STRWarrior
83d3635e0b Added quartz stairs. 2013-08-12 02:31:02 -07:00
madmaxoft
d4a3c451c4 Added OnExploding() and OnExploded() hooks. 
As requested in FS 413, with extra parameters:
World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData

OnExploding() can return 3 values:
StopHook, CanCauseFire, ExplosionSize
 2013-08-09 14:58:43 +02:00
madmaxoft
073bcd0361 Added the Carpet block. 2013-08-05 10:43:43 +02:00
madmaxoft@gmail.com
2fca0567bf Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-12 20:28:41 +00:00
madmaxoft@gmail.com
37f6c78404 Added DamageType translation to API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 18:46:45 +00:00
madmaxoft@gmail.com
9dd0486faf Added the End height and composition generators. 
Also made the dimension in world.ini specifiable by a string. Exported StringToDimension() and StringToBiome() to Lua API.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1621 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-22 18:41:08 +00:00
madmaxoft@gmail.com
c867bdac24 Updated the stacking (Patch contributed by Stephen304) 
http://forum.mc-server.org/showthread.php?tid=503&pid=8609#pid8609

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1614 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-20 18:29:34 +00:00
madmaxoft@gmail.com
007e75de9d Implemented the Hopper block handler 
Hoppers can be placed properly, but won't work yet.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1583 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-12 08:22:34 +00:00
madmaxoft@gmail.com
a9d221b74b ToLuaDoxy: initial import 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1544 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-04 09:46:32 +00:00
madmaxoft@gmail.com
96d5986733 Alpha-sorted the block meta list 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1512 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-26 14:32:25 +00:00
madmaxoft@gmail.com
5d3ade0267 Inventory changes made by plugins are now propagated to the client 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1495 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-19 18:41:16 +00:00
madmaxoft@gmail.com
502935c061 Mineshafts: Added random loot to generated chests and fixed chest direction 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1365 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-06 21:21:57 +00:00
madmaxoft@gmail.com
c1177929df MineShafts: added random torches, fixed beams on chunk boundaries 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1344 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-01 11:32:22 +00:00
madmaxoft@gmail.com
59f3adf210 MineShafts: Added tracks to corridors 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1342 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-31 19:23:09 +00:00
madmaxoft@gmail.com
0e2340ee34 Added missing item types, fixed placing stone walls. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1243 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-03 14:00:49 +00:00
madmaxoft@gmail.com
cadf97a70a Added the anvil block 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1239 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-02 19:55:04 +00:00
madmaxoft@gmail.com
32ee4aaf1e Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-16 11:12:56 +00:00
madmaxoft@gmail.com
246ab5d971 Fixed previous commit 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1216 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-15 22:03:10 +00:00
madmaxoft
666a718db1 Block and recipe update by STR_Warrior. 
Adds missing fuels
Adds missing furnace recipes (FS #304)
Fixes some recipes (FS #305)
Adds current 1.5 weekly snapshot blocks and items.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1215 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-15 15:26:33 +00:00
madmaxoft@gmail.com
6c97763b2f Obsoleted E_BLOCK_COCA_PLANT in favor of E_BLOCK_COCOA_POD. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1162 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-22 06:46:39 +00:00
madmaxoft@gmail.com
43e6840719 Merged branch "branches/hooks" into "trunk". 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-12 04:46:01 +00:00
luksor111@gmail.com
ffcfa7c89b Added flower pots 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-27 01:01:16 +00:00
madmaxoft@gmail.com
641c7f868c Added 1.4.6 items (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1101 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-24 22:28:48 +00:00
luksor111@gmail.com
eed6f9bb7b Fixed drops for: Stone, Mycelium, Redstone Torch. 
Fixed item usage for Jukeboxes and Spawn eggs in survival.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1064 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-24 09:50:38 +00:00
luksor111@gmail.com
ea8545dff1 - Added the "wait" music disc 
- Vines can now be placed on leaves

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1045 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-15 18:57:47 +00:00
madmaxoft@gmail.com
96f7246df1 Added cWorld:SpawnMob(PosX, PosY, PosZ, EntityType) to Lua API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1014 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-28 14:57:35 +00:00
luksor111@gmail.com
1e45242546 New Block property g_BlockIsSolid[]; Fixed ladder, torches and vines placement. (Patch contributed by funmaker) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1005 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-23 18:13:37 +00:00
faketruth
673fdcd768 Added some missing block enums 
Spruce, birch and jungle wood stairs now orient correctly

git-svn-id: http://mc-server.googlecode.com/svn/trunk@916 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-30 19:07:03 +00:00
madmaxoft@gmail.com
bc466f07a4 Refactored windows. 
As described on the forum: http://forum.mc-server.org/showthread.php?tid=561
For now, only basic clicking works; shift-click not implemented yet.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@867 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-20 13:25:54 +00:00
madmaxoft@gmail.com
8c43857b73 Added the ItemToString() and ItemTypeToString() functions. 
Ref.: http://forum.mc-server.org/showthread.php?tid=434&pid=4506#pid4506

git-svn-id: http://mc-server.googlecode.com/svn/trunk@847 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 16:08:29 +00:00
madmaxoft@gmail.com
dfa9a1e7c4 Added a few more stackable items 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@733 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-14 09:28:17 +00:00
madmaxoft@gmail.com
897733a58e Use named constants instead of magic values - block digging direction and torch placement 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@724 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-10 20:42:59 +00:00
madmaxoft@gmail.com
2a72c5c838 Fixed a few gcc pedantic warnings; made BLOCKTYPE an unsigned char type. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@711 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-03 11:53:11 +00:00
madmaxoft@gmail.com
9dc0e3c233 Fixed warnings in item handlers - items' damage value is a short, but block meta is only a NIBBLETYPE. Also slight cleanup. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@704 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-07-29 12:07:22 +00:00