summaryrefslogtreecommitdiffstats
path: root/source/BlockID.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawningSamuel Barney2013-10-141-0/+4
|\ | | | | | | | | | | | | Conflicts: source/Mobs/Bat.h source/Mobs/Monster.h source/World.cpp
| * Merge branch 'master' into MobSpawningmgueydan2013-09-221-17/+22
| |\
| * | Adding Water and Lava as transparency blocksmgueydan2013-09-071-0/+4
| | |
* | | Added 1.7 biome constants.madmaxoft2013-10-121-0/+42
| | |
* | | Added GetIniItemSet() function.madmaxoft2013-10-111-0/+15
| | | | | | | | | | | | It reads a block / item description from the specified INI file value and returns as cItem; stores and uses the default if value doesn't exist.
* | | Added glass pane as transparent. Removed excess g_BlockOneHitDig[E_BLOCK_REDSTONE_WIRE].Samuel Barney2013-10-011-1/+1
| | |
* | | Implemented redstone comparatorsTiger Wang2013-09-181-0/+6
| | | | | | | | | | | | They can be placed and toggled, but stills needs proper redstone support
* | | Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickupsmadmaxoft2013-09-151-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: source/BlockID.cpp source/Entities/Entity.cpp
| * | | Even more fixes [SEE DESC]Tiger Wang2013-09-131-1/+1
| |/ / | | | | | | | | | | | | | | | | | | * Fixed minecarts breaking completely due to stuff * Rails are now non solid again + Added IsRail inline bool - Removed Herobrine
* | | Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixesmadmaxoft2013-09-151-30/+75
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: source/Blocks/BlockTorch.h
| * | | Torches work properlyTiger Wang2013-09-151-30/+75
| |/ / | | | | | | | | | Also fixed a naming inconsistency concerning quartz stairs.
* | | Alpha-sorted g_BlockIsSnowable[].madmaxoft2013-09-081-2/+2
| | |
* | | Re-added the top line.STRWarrior2013-09-081-0/+1
| | |
* | | Added E_BLOCK_LILY_PAD to g_BlockIsSnowable.STRWarrior2013-09-081-2/+3
| |/ |/|
* | Merged branch 'Projectiles'.madmaxoft2013-09-071-17/+22
|\ \ | |/ |/|
| * Added dtRangedAttack, fixed faulty StringTODamageType()madmaxoft2013-09-011-17/+22
| |
* | Preliminary Minecart physics handling [SEE DESC]Tiger Wang2013-08-271-1/+1
|/ | | | | | | | | | | | | | 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
* Updated block transparenciesTiger Wang2013-08-201-0/+2
| | | | Now includes activator rails and piston extensions
* Merge remote-tracking branch 'upstream/master'Tiger Wang2013-08-161-33/+34
|\
| * Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.madmaxoft2013-08-161-33/+34
| | | | | | | | Also slightly improved the spawning algorithm.
* | Feature and bugfixes [SEE DESC]Tiger Wang2013-08-161-0/+2
|/ | | | | | | | | 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
* Alpha sorted PistonBreakable listTiger Wang2013-08-141-2/+3
|
* Buncha bugfixes [SEE DESC]Tiger Wang2013-08-141-4/+4
| | | | | | | 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
* Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior)madmaxoft@gmail.com2013-07-121-0/+50
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Ice is a solid block.madmaxoft@gmail.com2013-07-071-1/+0
| | | | | | Helps with FS #381 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added DamageType translation to APImadmaxoft@gmail.com2013-07-011-1/+101
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the End height and composition generators.madmaxoft@gmail.com2013-06-221-0/+41
| | | | | | 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
* Lighting: Fixed underwater lighting (FS #369)madmaxoft@gmail.com2013-05-051-4/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1444 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added carrots and potatoes handling, bonemealing and proper lighting.madmaxoft@gmail.com2013-04-051-0/+8
| | | | | | FS #166 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Cobweb lets light through.madmaxoft@gmail.com2013-04-011-0/+1
| | | | | | Fix for FS #351 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1349 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols.madmaxoft@gmail.com2013-02-161-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Merged branch "branches/hooks" into "trunk".madmaxoft@gmail.com2013-01-121-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Cauldrons and Brewing Stands are now placeableluksor111@gmail.com2012-12-291-0/+1
| | | | | | 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
* Added flower potsluksor111@gmail.com2012-12-271-25/+31
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Implemented double doorsluksor111@gmail.com2012-12-191-0/+4
| | | | | | | | | 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
* Rails don't turn grass into dirt underneath them. (Patch contributed by STR_Warrior)madmaxoft@gmail.com2012-11-251-0/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1066 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed wrong c++ standard assumptions about bools.madmaxoft@gmail.com2012-11-181-2/+12
| | | | | | | 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
* #grammarnazi: fixed tabs to spaces and alpha-sortmadmaxoft@gmail.com2012-10-231-67/+68
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1007 0a769ca7-a7f5-676a-18bf-c427514a06d6
* New Block property g_BlockIsSolid[]; Fixed ladder, torches and vines placement. (Patch contributed by funmaker)luksor111@gmail.com2012-10-231-2/+64
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1005 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Top blocks are now snowed over, either normally, or in deep snow (patch contributed by funmaker, Luksor and Sebi)madmaxoft@gmail.com2012-10-211-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1000 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Source files cleanup: The rest of the files renamed.madmaxoft@gmail.com2012-09-241-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Refactored windows.madmaxoft@gmail.com2012-09-201-0/+11
| | | | | | | 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
* ItemToString() now recognizes matches that are in the ini without metadata.madmaxoft@gmail.com2012-09-081-0/+15
| | | | | | "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
* StringToItem() sets item's count to 1 after a successful parsemadmaxoft@gmail.com2012-09-081-1/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@854 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed item damage not being set properly in StringToItem()madmaxoft@gmail.com2012-09-081-0/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@853 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Set leaves as a transparent block.madmaxoft@gmail.com2012-09-081-0/+1
| | | | | | 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
* Another fix for the case-sensitiveness. WTF, STL allows different signatures for Debug and Release builds?madmaxoft@gmail.com2012-09-081-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@849 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed the case-sensitiveness of the item map.madmaxoft@gmail.com2012-09-081-1/+10
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@848 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the ItemToString() and ItemTypeToString() functions.madmaxoft@gmail.com2012-09-081-33/+148
| | | | | | 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
* Snow is not put atop vines by the snow finisher anymoremadmaxoft@gmail.com2012-09-071-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@843 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Made cobwebs transparentmadmaxoft@gmail.com2012-08-141-8/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@731 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Some code improvementslapayo94@gmail.com2012-07-161-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6
* A new Block handling system :olapayo94@gmail.com2012-07-151-0/+38
| | | | | | | | | | 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
* Fixed lighting for cake, fence, fence gates, glass pane, iron bars, iron door and wooden doormadmaxoft@gmail.com2012-06-161-0/+7
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@625 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Attempt to bring sanity to newlines across systems.cedeel@gmail.com2012-06-141-325/+325
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Tall grass finally drops seedsmadmaxoft@gmail.com2012-06-091-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@581 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Grass grows under vinesmadmaxoft@gmail.com2012-06-071-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@569 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Hopefully fixed lighting around chests and cropsmadmaxoft@gmail.com2012-06-061-0/+5
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@562 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed Linux compilation.cedeel@gmail.com2012-06-041-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@550 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the new recipe parser, parsing the crafting.txt file. Included are a few recipes. The old parser still works, but will be replaced soon.madmaxoft@gmail.com2012-06-041-1/+42
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@549 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the Biomal height generator, made it the default height generator.madmaxoft@gmail.com2012-06-021-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@536 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Cacti don't gather snowmadmaxoft@gmail.com2012-05-281-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@517 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Ice finisher generator; fixed snow on water.madmaxoft@gmail.com2012-05-271-0/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@515 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added some useful biome synonyms; added block property IsSnowable; alphabetically sorted block property settingmadmaxoft@gmail.com2012-05-271-50/+80
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@513 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the CheckerBoardBiomes parameter for setting biomes that CheckerBoard generates (#179). Added string-to-biome conversion (#183). Added OreNests to default Structures configuration.madmaxoft@gmail.com2012-05-271-0/+56
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@506 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Merged the composable_generator branch into the trunkmadmaxoft@gmail.com2012-05-251-0/+186
git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:16:04 +0100