Commit Graph
5893 Commits
Author SHA1 Message Date
Alexander Harkness 35a4aa419c Merge pull request #1096 from mc-server/redstonerefactor
Moved delayed repeaters to be handled in a seperate pass
2014-06-18 21:22:53 +01:00
Mattes D c30b7b8735 Merge pull request #1045 from Howaner/GlobalFixes
Little fixes
2014-06-18 18:23:18 +02:00
archshift 21b9253ee6 Merge pull request #1100 from Howaner/Slabs 2014-06-18 00:47:08 -07:00
worktycho 2f2071afc1 Merge pull request #1101 from Howaner/FenceGate
Fix fence gate redstone simulator.
2014-06-17 18:39:21 +01:00
Howaner c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner 8e927e6e2b Check block type from cBlockEntity 2014-06-17 14:45:29 +02:00
Mattes D f682646d3a Merge pull request #1099 from Howaner/Blocks
Glass-made blocks don't drop pickups.
2014-06-17 14:03:24 +02:00
Mattes D 532d388d07 Merge pull request #1102 from Howaner/PressurePlate
Add pressure plate handler
2014-06-17 13:52:00 +02:00
Howaner 7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner da88c98034 Add comment. 2014-06-17 13:25:36 +02:00
Howaner a4d4621fbe Add parenthesis 2014-06-17 12:47:18 +02:00
Howaner 1086b8ba05 Revert "Fix right click bugs."
This reverts commit 61b6fdde75.
2014-06-17 01:18:09 +02:00
Howaner 46b84aa8b6 The motion is already set in AddBasicEntity() 2014-06-17 01:17:35 +02:00
Howaner a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
Howaner 1316d2d24d Add end lines to BlockPressurePlate.h 2014-06-17 00:41:31 +02:00
Howaner 43ff96f664 Add pressure plate handler 2014-06-17 00:40:35 +02:00
Howaner a10b716ba2 Fix fence gate redstone simulator. 2014-06-17 00:22:57 +02:00
Howaner 9dea609194 Fix doubleslab meta. 2014-06-16 23:35:30 +02:00
Howaner 7c4b8306aa Glass shouldn't drop. 2014-06-16 23:05:29 +02:00
madmaxoft d6979ad95d Fixed GCC compilation. 2014-06-16 22:53:08 +02:00
madmaxoft 9c3086d88c Fixed MSVC builds. 2014-06-16 22:42:50 +02:00
Tycho 74cd730589 FIxed second weird enum 2014-06-16 18:06:09 +01:00
Tycho 6fa99a211e Refactored reversing logic into seperate function 2014-06-16 17:55:58 +01:00
worktycho 4fddbf9dfc Merge pull request #883 from mc-server/CutOffLighting
Lighting reads blocktypes only for blocks under heightmap.
2014-06-16 17:37:07 +01:00
madmaxoft d379f27ea4 Fixed gcc compilation. 2014-06-16 16:51:30 +02:00
Tycho 3a7c0c8ce9 Fixed tigers weird enums 2014-06-16 15:29:49 +01:00
Tycho d5c84b5fe6 Merge branch 'master' into redstonerefactor
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-06-16 15:22:02 +01:00
Tycho 6ee562caf3 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:13:10 +01:00
Tycho ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tycho aa3537112d Moved repeater handling to seperate pass 2014-06-16 15:07:41 +01:00
Tycho 84c83e0deb Fix a few warnings 2014-06-16 15:03:07 +01:00
Mattes D 24b0878af7 Merge pull request #1024 from worktycho/AllocationPool
First attempt at implementing an Allocation pool
2014-06-16 16:00:14 +02:00
Tycho 1e57161ecc Added override 2014-06-16 14:12:10 +01:00
madmaxoft 6b503b45a0 Fixed a copypasta error in WormNestCaves generator settings. 2014-06-16 14:53:33 +02:00
madmaxoft c41299b4d4 Updated the SandFlatRoofVillage prefabs. 2014-06-16 10:18:44 +02:00
madmaxoft d9719e696c Added random offsets to cGridStructGen.
Fixes #740.
2014-06-15 23:34:44 +02:00
Mattes D a72ec6300d Merge pull request #1090 from mc-server/saveoncrash
Data is saved on crash
2014-06-15 23:16:37 +02:00
Tiger Wang abbd11be6d Players are saved regularly
* Fixes #1076
2014-06-15 20:28:08 +01:00
Tiger Wang f822a46bdb Fixed bad comparison crash
* Fixes #1095
2014-06-15 19:42:14 +01:00
Tiger Wang 2a6ca71a0b Fixed daylight sensor unpowering
* Fixes #1094
2014-06-15 16:27:20 +01:00
Tycho 8a2aa6cb16 Changed names of callbacks 2014-06-14 20:24:52 +01:00
Tycho 6ddcf42409 Removed spaces 2014-06-14 20:10:49 +01:00
Tycho 41e5a64ff8 Documented starvation callbacks 2014-06-14 20:07:17 +01:00
Tycho 2643a46c69 Documented cAllocationPool 2014-06-14 20:04:35 +01:00
Tycho f97116141f Reformated ChunkMap.h 2014-06-14 19:56:01 +01:00
Tycho 3efbdb1c9b Moved m_Sections 2014-06-14 19:54:09 +01:00
Tycho 94c48febd2 Added generic Allocation Pool Interface 2014-06-14 19:46:34 +01:00
Tycho a1520c7a40 reverted accedental android changes 2014-06-14 19:08:14 +01:00
Tycho 6b99e55646 fixed spaces 2014-06-14 19:05:02 +01:00
Tycho 0310a50192 fixed spaces 2014-06-14 18:43:36 +01:00