flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
2,197 Commits 1 Branch 0 Tags 92 MiB
558cc1bf26
Commit Graph

59 Commits

Author SHA1 Message Date
madmaxoft
5cde7d8a29 Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups 
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
 2013-09-15 20:49:08 +02:00
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
Tiger Wang
22b8f3a2e0 Even more fixes [SEE DESC] 
* Fixed minecarts breaking completely due to stuff
* Rails are now non solid again
+ Added IsRail inline bool
- Removed Herobrine
 2013-09-12 23:57:02 +01:00
madmaxoft
ab61b4193b Alpha-sorted g_BlockIsSnowable[]. 2013-09-08 18:39:35 +02:00
STRWarrior
7862a76684 Re-added the top line. 2013-09-08 18:35:48 +02:00
STRWarrior
00a25016b3 Added E_BLOCK_LILY_PAD to g_BlockIsSnowable. 2013-09-08 18:33:53 +02:00
madmaxoft
d31142811d Merged branch 'Projectiles'. 2013-09-07 22:06:30 +02:00
madmaxoft
0dec48d496 Added dtRangedAttack, fixed faulty StringTODamageType() 2013-09-01 20:06:49 +02:00
Tiger Wang
f1f86c46d3 Preliminary Minecart physics handling [SEE DESC] 
This commit includes physics handling for the following scenarios:

Flat rails in orientations [N, S, W, E]
Ascending/descending rails in orientations [N, S, W, E]

Powered rails are NOT handled (they don't respond to redstone).
Curved rails are NOT handled (I haven't figured out how to do them :P)

Please note that I have not tried to emulate vanilla behaviour because
of a lack of knowledge on velocity unites/C++. We can say it's a feature
or something. :P
 2013-08-27 20:38:11 +01:00
Tiger Wang
aeabf0f82e Updated block transparencies 
Now includes activator rails and piston extensions
 2013-08-20 20:15:21 +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
Tiger Wang
4ae1750da2 Alpha sorted PistonBreakable list 2013-08-14 11:50:21 +01:00
Tiger Wang
303b1a9c45 Buncha bugfixes [SEE DESC] 
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
 2013-08-14 11:44:02 +01: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
a72c6d9613 Ice is a solid block. 
Helps with FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 19:58:33 +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
1e350218cc Lighting: Fixed underwater lighting (FS #369) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1444 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-05 14:48:18 +00:00
madmaxoft@gmail.com
d397dd263f Added carrots and potatoes handling, bonemealing and proper lighting. 
FS #166

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-05 13:45:00 +00:00
madmaxoft@gmail.com
b661b26138 Cobweb lets light through. 
Fix for FS #351

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1349 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-01 21:36:28 +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
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
4561b2c22f Cauldrons and Brewing Stands are now placeable 
Cauldrons can be filled with water and used to fill bottles

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-29 11:49:00 +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
luksor111@gmail.com
a10c4774f5 Implemented double doors 
Implemented fence gate
Updated g_BlockTransparent[]
Doors can now only be opened by right clicking
Doors will now drop when not supported by block

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1080 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-19 09:29:53 +00:00
madmaxoft@gmail.com
46c7f75cab Rails don't turn grass into dirt underneath them. (Patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1066 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-25 20:31:07 +00:00
madmaxoft@gmail.com
65bc09f8e8 Fixed wrong c++ standard assumptions about bools. 
Should fix FS #265.
http://forum.mc-server.org/showthread.php?tid=629&pid=5415#pid5415

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1053 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-18 21:50:05 +00:00
madmaxoft@gmail.com
5c5463c335 #grammarnazi: fixed tabs to spaces and alpha-sort 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1007 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-23 19:48:16 +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
madmaxoft@gmail.com
ba8a5184c8 Top blocks are now snowed over, either normally, or in deep snow (patch contributed by funmaker, Luksor and Sebi) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1000 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-21 21:15:57 +00:00
madmaxoft@gmail.com
ecfe6ab65b Source files cleanup: The rest of the files renamed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-23 22:09:57 +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
92c7d48af0 ItemToString() now recognizes matches that are in the ini without metadata. 
"323:0" -> "sign", although ini says "sign=323" only.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@856 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 21:49:27 +00:00
madmaxoft@gmail.com
27b02efffa StringToItem() sets item's count to 1 after a successful parse 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@854 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 21:33:53 +00:00
madmaxoft@gmail.com
3f1eb05593 Fixed item damage not being set properly in StringToItem() 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@853 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 21:20:36 +00:00
madmaxoft@gmail.com
985fd3ca2c Set leaves as a transparent block. 
Initiated by STR_Warrior, http://forum.mc-server.org/showthread.php?tid=434&pid=4512#pid4512

git-svn-id: http://mc-server.googlecode.com/svn/trunk@852 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 21:08:21 +00:00
madmaxoft@gmail.com
675d35cd46 Another fix for the case-sensitiveness. WTF, STL allows different signatures for Debug and Release builds? 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@849 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 17:02:11 +00:00
madmaxoft@gmail.com
fbefff45b1 Fixed the case-sensitiveness of the item map. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@848 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 16:38:27 +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
4a3b5e93ec Snow is not put atop vines by the snow finisher anymore 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@843 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-07 16:05:10 +00:00
madmaxoft@gmail.com
63e68865b1 Made cobwebs transparent 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@731 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-14 08:32:23 +00:00
lapayo94@gmail.com
86a991c5a8 Some code improvements 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-07-16 19:20:37 +00:00
lapayo94@gmail.com
14dce23845 A new Block handling system :o 
It was really a lot of work :D
Took me the complete weekend :D

Would really like to here your opinion on this =)
The aim of this is to put all the actions for one block in one place so it is not spread around the source. (ToPickup, Action in cWorld, Action in cChunk, Action here, action there :D)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@671 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-07-15 20:36:34 +00:00
madmaxoft@gmail.com
3efd8fdabb Fixed lighting for cake, fence, fence gates, glass pane, iron bars, iron door and wooden door 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@625 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-06-16 18:44:07 +00:00
cedeel@gmail.com
92c59963f8 Attempt to bring sanity to newlines across systems. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-06-14 13:06:06 +00:00
madmaxoft@gmail.com
648c7fe943 Tall grass finally drops seeds 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@581 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-06-09 11:31:42 +00:00
madmaxoft@gmail.com
4f1222b20a Grass grows under vines 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@569 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-06-07 11:24:56 +00:00