1
0
Commit Graph

2349 Commits

Author SHA1 Message Date
madmaxoft
d61ff4da3b Fixed sign and lever rotations. 2014-06-23 00:15:55 +02:00
madmaxoft
82dcc0b4db Prefabs don't draw into chunk if they don't intersect. 2014-06-23 00:15:55 +02:00
Tiger Wang
dc8817feee Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing
Conflicts:
	src/FurnaceRecipe.cpp
2014-06-22 21:51:21 +01:00
Tiger Wang
c476fc3cf5 Suggestions 2014-06-22 21:49:37 +01:00
Tiger Wang
dad0037f98 Bettered zombie and skeleton AI
* Fixed potential issues with skylight detection
2014-06-22 20:44:55 +01:00
Tiger Wang
4238b0ebe8 Some Entity.cpp style improvements 2014-06-22 20:44:18 +01:00
Tiger Wang
33cc1f2a50 Fixed multiple issues with projectiles
* Fixed arrows not being collectable/not truly hitting a block/not
lodging into blocks/not going in far enough
* Fixed projectiles not playing their block hit animation owning to
being destroyed too quickly
2014-06-22 20:44:01 +01:00
Mattes D
fe95dfa758 Merge pull request #1105 from Howaner/Blocks
Added door and fence gate sounds.
2014-06-22 20:56:24 +02:00
Howaner
bebfb230da Changed 0xFFFFFFFB to ~0x04 2014-06-22 17:29:02 +02:00
Tiger Wang
c13cffcd30 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-06-22 15:05:02 +01:00
Tiger Wang
3ec8b33b76 Fixed another daylight sensor bug
Additionally fixed unpowering across chunks.
2014-06-22 15:04:23 +01:00
Tiger Wang
b2bf466122 Chests don't open if obstructed
* Fixes FS383
2014-06-22 14:47:05 +01:00
worktycho
3c0452ebef Fixed missing break
Fixes CID 68409
2014-06-22 14:17:07 +01:00
worktycho
119ba562d5 Fixed invalid iterator
Fixes CID 60408
2014-06-22 14:15:41 +01:00
worktycho
63ce2e8b37 Fixed compile errors 2014-06-22 12:30:37 +01:00
Tiger Wang
4a01fba3aa Suggestions 2014-06-22 00:06:58 +01:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function.
Ref.: #771
2014-06-21 22:13:35 +02:00
Tiger Wang
537467fe25 Removed debugging code 2014-06-21 20:35:28 +01:00
Tiger Wang
a908f39dde Rewrote furnace recipe parser
* Fixes #110
2014-06-21 20:33:23 +01:00
madmaxoft
0a95d04ab3 Added a TestRails generator.
This is for debugging purposes only.
2014-06-21 20:19:44 +02:00
madmaxoft
9a57c590cd Fixed a caching bug in GridStructGen.
The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use.
2014-06-21 20:17:17 +02:00
madmaxoft
0e8c4ca5ab Updated prefabs to the latest Gallery content. 2014-06-21 15:02:40 +02:00
madmaxoft
b4ba86d758 Updated all prefabs to current Gallery content. 2014-06-20 22:45:08 +02:00
madmaxoft
79c1966290 MCA saver marks chunks as populated.
Fixes #140.
2014-06-20 21:30:11 +02:00
madmaxoft
9db9445e9f Optimized Voronoi calculation.
Fixes #818.
2014-06-20 17:10:18 +02:00
tonibm19
3e15c92d18 Added pig riding.
Now you can ride a pig using a carrot on a stick.
2014-06-20 10:50:21 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
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
STRWarrior
e0a9f37d90 (Force)ExecuteCommand returns the CommandResult enums
Exported and documented the CommandResult enums
2014-06-18 12:13:01 +02:00
archshift
21b9253ee6 Merge pull request #1100 from Howaner/Slabs 2014-06-18 00:47:08 -07:00
Howaner
2da7768298 Merge branch 'master' into Blocks 2014-06-17 19:50:26 +02:00
Howaner
bcf798f260 Fix fence gate sound (Redstone simulator). 2014-06-17 19:47:32 +02:00
worktycho
2f2071afc1 Merge pull request #1101 from Howaner/FenceGate
Fix fence gate redstone simulator.
2014-06-17 18:39:21 +01:00
Howaner
bde51d8778 Add fence gate sound. 2014-06-17 19:08:36 +02:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
8de8768f02 Add UNUSED() Tags 2014-06-17 17:01:23 +02:00
Howaner
0d08b9a62e Add door sound 2014-06-17 17:00:51 +02:00
STRWarrior
008a6ce311 Added crBlocked and crNoPermission 2014-06-17 16:19:31 +02:00
STRWarrior
15ae4ce233 HandleCommand now returns an CommandResult enum. 2014-06-17 14:55:15 +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
Howaner
7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner
ce06ec1632 derp 2014-06-17 13:33:41 +02:00
STRWarrior
8928310fd8 Fixed possible confusion.
If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players.
2014-06-17 13:27:04 +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
37de63895f The same: Float, not Double 2014-06-17 12:45:12 +02:00
Howaner
d89f03b90c Float, not Double 2014-06-17 12:43:45 +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
a1fd0b0335 Split Broadcast Sound Effect function call in multiple lines. 2014-06-16 23:41:23 +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
Howaner
b45e85a678 This isn't needed 2014-06-16 22:57:27 +02:00
Howaner
885a50d77a Fix bow sound and creative arrow pickup. 2014-06-16 22:57:13 +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
Howaner
e50423991e Add bow charging animation 2014-06-16 21:57:23 +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
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
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
Mattes D
c684812b30 Merge pull request #1019 from mc-server/cPlayerSetSpeed
cPlayer set speed
2014-06-14 18:57:32 +02:00
madmaxoft
493d364331 Removed an unused tolua_end and tolua_begin pair. 2014-06-14 18:23:27 +02:00
madmaxoft
a89422ea4c Simplified speed clamping. 2014-06-14 18:16:10 +02:00
madmaxoft
3f009a7c9e Refactored speed-setting to use a common function for all cases. 2014-06-14 17:10:53 +02:00
Mattes D
f1e3010839 Fixed bindings generation for Win64 builds.
Fixes #1092.
2014-06-14 15:47:37 +02:00
Mattes D
af981cc718 Fixed MSVC Bindings generation. 2014-06-14 15:00:57 +02:00
worktycho
d5a99d5b78 Remove windows bindings crutch 2014-06-14 13:48:12 +01:00
madmaxoft
f8f7748a09 Merge branch 'master' into cPlayerSetSpeed 2014-06-14 12:06:48 +02:00
Tiger Wang
c1deda5d8f Fixed a repeater issue
* Repeaters now properly continuously update their powering
* Minor cosmetic improvements
2014-06-14 10:47:10 +01:00
Tiger Wang
4b28a24514 Reduced cPluginManager code duplication 2014-06-14 09:51:42 +01:00
Mattes D
90e3e2b4e6 Merge pull request #1089 from mc-server/tolua-auto
automaticlly build tolua and generate bindings as part of build.
2014-06-13 16:32:34 +02:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00
tycho
9254666a85 automaticlly build tolua and generate bindings as part of build. 2014-06-12 18:00:53 +01:00
Tiger Wang
1bce1ac432 Fixed two redstone bugs
* Fixed chunk border powering
* Fixed quick place-replace powering
2014-06-12 17:13:52 +01:00
Alexander Harkness
db4d786a84 Merge pull request #1082 from mc-server/cauldronfixes
Add biome-aware downfall functions.
2014-06-12 16:50:08 +01:00
STRWarrior
a6a87f1996 Merge pull request #1084 from mc-server/PlankRoads
Plank Roads
2014-06-11 22:13:05 +02:00
madmaxoft
220e6f5880 DispenserEntity code cleanup after PR merge. 2014-06-11 19:46:24 +02:00
madmaxoft
d6b2660f36 Merge remote-tracking branch 'joannis/master' 2014-06-11 19:38:14 +02:00
STRWarrior
7cf544079f Roads in villages are made out of wooden planks if they generate on water. 2014-06-11 19:12:29 +02:00
Alexander Harkness
f9fd519360 Changed the teleport permissions to the new ones. 2014-06-11 17:26:10 +01:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
archshift
aa7c82580f Player.h: Moved doxy-comments to Entity.h
Moved doxy-comments to the defining function in Entity.h rather than the overloaded functions in Player.h
Comment for each function (instead of assumed encapsulating comments)
@deprecated tag for ForceSetSpeed()
2014-06-11 07:52:34 -07:00
Tiger Wang
e24830f0b1 Compile fix 2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e Reduced code duplication
call @maxmaxoft!
calling...
call connected (0:20)
call ended
2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74 IsWeatherSunnyAt does something useful :D 2014-06-11 13:37:04 +01:00
madmaxoft
b3300e3854 Added cBlockArea:GetCoordRange to Lua API. 2014-06-11 14:22:27 +02:00
Alexander Harkness
c09207cabc SMICOLOSL
Meant to be semicolons up there.
2014-06-11 13:20:31 +01:00
madmaxoft
7e4abcfe2d Revert "Initial Mesa Bryce implementation."
This reverts commit 1ff1a93866.
2014-06-11 14:15:18 +02:00
Tiger Wang
711113cd2b Updated unnecessary function :/ 2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1 Add DoxyComments to he weather things.
Also changed the function names.
2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67 Add new IsWeatherWet hook for cauldrons.
@madmaxoft can you comment?
2014-06-11 10:33:16 +01:00
worktycho
3e25852382 Removed assert that is now informed by type system 2014-06-11 10:04:34 +01:00
madmaxoft
1ff1a93866 Initial Mesa Bryce implementation. 2014-06-10 22:59:45 +02:00
madmaxoft
c259dad7b8 Fixed clang warnings about abs() in Noise.cpp.
MSVC provides a float overload of abs(), clang does not. Using the proper fabs().
2014-06-10 18:27:17 +02:00
madmaxoft
366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
madmaxoft
6c43799cc5 Fixed gcc compilation. 2014-06-10 09:20:32 +02:00
madmaxoft
9ff0ef87d4 Added an experimental height generator, Mountains. 2014-06-09 23:40:51 +02:00
madmaxoft
bead36f5ed Added cRidgedMultiNoise, fixed cPerlinNoise. 2014-06-09 23:38:50 +02:00
madmaxoft
2b45e720ad Added Y coord checks and documentation to cBlockDoorHandler. 2014-06-09 21:35:46 +02:00
madmaxoft
dcc71a3b7b Merge remote-tracking branch 'howaner/Redstone' 2014-06-09 21:20:26 +02:00
madmaxoft
02b509b81d ToLua can now be run in pure-lua mode.
See the src/Bindings/AllToLua_lua.bat for usage example.
2014-06-09 17:05:22 +02:00
madmaxoft
ec0976f9b0 Fixed a crash when creating negative-size blockareas.
Now the server emits a warning instead and continues execution.
2014-06-09 00:49:02 +02:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld.
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
madmaxoft
28b82d5bbb Proper fix for long interaction.
Fixes #1078 and #1038.
2014-06-08 11:32:52 +02:00
madmaxoft
0544b96f80 docs/Generator: Added the easy Finishers. 2014-06-07 13:59:51 +02:00
madmaxoft
ec40c7c83a Added RainbowRoads finisher generator. 2014-06-07 13:59:50 +02:00
Tiger Wang
d5649df326 Further improvements on redstone speed
Based on suggestions of @worktycho
* Repeaters now walk their data structure only when needed
* Fixed a bug with cChunkData returning an incorrect value for whether a
meta had changed
2014-06-07 10:39:36 +01:00
archshift
b768e54ce8 Fixed mob hitbox sizes, removed TODOs
Measured bat and blaze in vanilla, updated values.
Cavespiders are, in fact, passive in the day.
2014-06-07 00:40:01 -07:00
Tiger Wang
5f56773dde Further reduced redstone idle CPU consumption
* Repeaters and wires are no longer unnecessarily ticked
* Fixed #1063, likely addressed #1062
* Fixed bugs regarding duplicate values
2014-06-06 20:36:50 +01:00
JoannisO
720ae4f757 - Fixed a lot of alignment 2014-06-05 12:26:27 +02:00
Tiger Wang
22236a103a Redstone fixes and improvements [SEE DESC]
Haha, see desc.

* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
2014-06-04 23:23:22 +01:00
Mattes D
c11488ccd7 Merge pull request #1011 from SphinxC0re/SomeWarningFixes
Fixed some warnings
2014-06-04 18:02:45 +02:00
Howaner
33fbdedea3 Fix itemframe break. 2014-06-04 15:16:30 +02:00
JoannisO
852e162f95 - Removed the code that removed fireworks from a dispenser even thought
they weren't launched.
2014-06-04 12:40:01 +02:00
worktycho
c94d0c8144 derp 2014-06-04 11:39:21 +01:00
JoannisO
e5b345a9c9 - Fixed variable names in a function. 2014-06-04 12:37:51 +02:00
JoannisO
2c103a713e - Fixed a lot of astethics 2014-06-04 12:35:45 +02:00
worktycho
ae37dfec8d Fixed bad coordinate 2014-06-04 11:29:08 +01:00
worktycho
98c575ebc2 Make sure m_StackSizeToBeUsedInRepair Always has a valid value 2014-06-04 11:12:06 +01:00
worktycho
85be62a8cd Removed unused field test 2014-06-04 11:02:17 +01:00
worktycho
87c4d0ea57 Initialise m_Callbacks field to NULL in empty constructor. 2014-06-04 10:58:09 +01:00
Tiger Wang
9ef4b9d52d Exploded creepers drop nothing, part of #1058 2014-06-04 09:27:50 +01:00
Tiger Wang
c4e0da2d0a Fixed mob loading, part of #1058 2014-06-04 09:22:19 +01:00
Tiger Wang
8e57f75622 Fixed #1057 2014-06-04 09:21:44 +01:00
Julian Laubstein
8604dedfdf Update IncrementalRedstoneSimulator.cpp 2014-06-04 10:20:20 +02:00
madmaxoft
c0015d01c6 Player permissions aren't logged to console anymore.
This was only logspam on most servers and there are alternative ways to list players' permissions.
2014-06-03 19:50:27 +02:00
JoannisO
7993caa553 - Fixed an issue where there were 2 "DispChunk"-s in the same function.
Resused the initial one.
2014-06-03 19:43:15 +02:00
JoannisO
c0716bfcf6 - Fixed a bug where I didn't return anything in the GetShootVector
function. This was however passed as "working" by GCC.
2014-06-03 19:39:56 +02:00
madmaxoft
492f99eaeb Merge remote-tracking branch 'howaner/Inventory' 2014-06-03 19:30:01 +02:00
madmaxoft
d92520016d Fixed OnProjectileHitBlock bindings.
Also sorted the various cLuaState::Push() functions.
2014-06-03 19:29:23 +02:00