flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,001 Commits 1 Branch 0 Tags 92 MiB
8180b643ff
Commit Graph

765 Commits

Author SHA1 Message Date
STRWarrior
f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
madmaxoft
118b7a121b Moved the win resources into a separate subfolder. 
This will allow us to use them in CMake builds.
 2014-01-12 17:57:29 +01:00
madmaxoft
2ca06cc213 CMake generates Bindings when not existant (win) 2014-01-12 17:20:29 +01:00
STRWarrior
c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
Tiger Wang
e114008559 Fixed settings plugin generation after IniFile 2014-01-12 14:03:50 +00:00
STRWarrior
6ff375273b Added cWorld::SpawnMinecart. 2014-01-12 14:33:32 +01:00
Tiger Wang
ec6c510bd4 Multiple enhancements and fixes to minecarts 
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
 2014-01-12 13:28:37 +00:00
Alexander Harkness
273db55bdf Merge pull request #529 from mc-server/derpstonerefactor 
Major refactoring of redstone
 2014-01-12 04:38:41 -08:00
madmaxoft
328b2db252 Disabled a useless MSVC warning in Bindings.cpp. 2014-01-12 08:43:13 +01:00
Mattes D
751c53ecc6 Merge pull request #532 from mc-server/LuaStateErrorHandler 
Lua state error handler
 2014-01-11 23:33:29 -08:00
madmaxoft
023ba17688 Lua errors display stack trace. 
Fixes #418.
 2014-01-11 23:10:40 +01:00
madmaxoft
b2b7e45757 Removed internal methods from public cLuaState interface. 
PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides.
Push() needs to be left in the public part, it is used for pushing results in the ManualBindings.

Preparation for #418.
 2014-01-11 22:51:10 +01:00
Tiger Wang
318c353ee4 Fixed rails powering 2014-01-11 21:32:42 +00:00
madmaxoft
acfebab027 Removed an unused file. 2014-01-11 21:22:40 +01:00
Mattes D
498fb5b675 Merge pull request #527 from derouinw/biomessplit 
Biomessplit
 2014-01-11 12:20:41 -08:00
madmaxoft
2634261a28 Removed unused variables. 
The Lua API calls had no side-effects, either.
 2014-01-11 20:29:56 +01:00
Mattes D
5417f7bd2d Merge pull request #530 from mc-server/GeneratorDecouple 
Decoupled cChunkGenerator from cWorld and cRoot.
 2014-01-11 11:26:09 -08:00
Tiger Wang
ff57381631 Did some stuff with the vectors 2014-01-11 14:26:18 +00:00
andrew
05e22dccf2 Fixed glowstone drop count 2014-01-11 11:38:34 +02:00
Tiger Wang
6b25ef4fa3 Fixed a door bug and reduced code 
Doors wouldn't get powered by repeaters, and some blocks, like glass,
were viable middle blocks when they shouldn't have been.
 2014-01-11 01:52:14 +00:00
Tiger Wang
b068b73ad9 Renamed g_TorchPlaceable... 
...to g_FullyOccupiesVoxel, as recommended by @bearbin
 2014-01-11 01:51:24 +00:00
Bill Derouin
af89794d76 Globals.h needs to be first include 2014-01-10 15:50:52 -06:00
Tiger Wang
d5b38402ed Fixed doors, fixes #453 2014-01-10 21:35:41 +00:00
madmaxoft
cea997426b Decoupled cChunkGenerator from cWorld and cRoot. 
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
 2014-01-10 22:22:54 +01:00
Tiger Wang
e7fba08e6c Major refactoring of redstone 
This commit is a refactoring of the redstone code, mainly the functions
handling the removal of invalid blocks from power supplier data
structures. Its aim is to improve performance and potentially reduce the
memory footprint of the data structures.

It works to reduce the amount of GetBlock()s triggered every tick.
Before, a GetBlock() was requested for every single item in the data
lists, as well as for every single redstone block in a chunk. Following
these changes, the AddBlock() event is utilised more effectively to only
update the lists when needed (a block is changed), as well as to insert
the block type (and update it when needed) alongside the coordinates
into the main redstone simulator chunkdata list.

In short, a single GetBlock() is now cached, with this cache being
updated when the simulator is awoken due to a block change.

At least, I *hope* that this is what it does :P
 2014-01-10 20:31:05 +00:00
Bill Derouin
fe48f62575 Include Biome enum in ChunkDef 
Can't forward declare an enum
 2014-01-10 10:30:56 -06:00
Bill Derouin
ee74411024 Added newlines at ends of files 2014-01-10 10:10:24 -06:00
madmaxoft
712e6e0bb2 Fixed generator adding values to ini file. 2014-01-10 16:34:09 +01:00
STRWarrior
82a06725bd Added cFinishGenNetherSprinkleFoliage. 2014-01-10 16:31:45 +01:00
Bill Derouin
1c2004dfbb Fixed missing externals 
Turns out you actually have to include the .cpp in the project file
 2014-01-10 09:23:53 -06:00
Mattes D
6943a4df74 Merge pull request #520 from mc-server/SoulSand 
NetherGen: Now generates SoulSand.
 2014-01-10 07:14:19 -08:00
STRWarrior
36c100a53e Fixed recurring pattern. 2014-01-10 16:12:45 +01:00
Bill Derouin
cee76f1ace Move biome definition to separate files 2014-01-09 15:21:46 -06:00
madmaxoft
bb96737f45 Exported cClientHandle::SendPluginMessage() to Lua. 2014-01-09 14:25:37 +01:00
madmaxoft
f3bedb3c32 Fixed wrong packet number for PluginMessage packet. 2014-01-09 14:24:57 +01:00
STRWarrior
6c75cbc8d7 Fixed chunk borders. 2014-01-09 13:30:04 +01:00
madmaxoft
fe978f0d1e Added cClientHandle::SendPluginMessage(). 
It is not yet exported in the API, though.
 2014-01-09 11:39:42 +01:00
madmaxoft
bd17662412 Composition generator creating moved to a separate function. 
Also it forces the defaults into the INI file.
 2014-01-09 10:35:51 +01:00
madmaxoft
1ef20e858f Height generator creating moved info HeiGen.cpp. 
The generator also explicitly sets the default back into the INI file.
 2014-01-09 10:21:26 +01:00
Mattes D
91d70b87e5 Merge pull request #517 from derouinw/master 
Add missing plugin error
 2014-01-08 23:51:32 -08:00
STRWarrior
d462085108 Speed-up. I got about 40 extra ch/s 2014-01-08 22:23:26 +01:00
Bill Derouin
154d6b989a A couple touchups 2014-01-08 13:45:16 -06:00
STRWarrior
5aa34cf77d WormNestCaves now remove soul sand. 2014-01-08 15:34:49 +01:00
STRWarrior
ca8421fe26 NetherGen: Now generates SoulSand. 2014-01-08 15:26:43 +01:00
madmaxoft
38d0bdf00a Fixed AppendVPrintf() handling for large strings. 
This caused a failure in server favicons.
 2014-01-08 14:23:15 +01:00
Tiger Wang
f578dbfc54 Graceful shutdown on SIGTERM 2014-01-07 21:23:26 +00:00
Bill Derouin
e0d94e0f06 Add missing plugin error 
Previously, if a plugin was included but the folder had no lua files,
the error given was ambiguous. Now, it explicitly describes lack of lua
files.

See issue #512

P.S. This probably isn't the best way, but this is where the fix can be
made.
 2014-01-07 13:47:15 -06:00
Alexander Harkness
01fcf2fecb Merge pull request #516 from mc-server/favicon 
Fixed favicons
 2014-01-07 09:09:57 -08:00
Tiger Wang
1d96a615b5 Fixed favicons 2014-01-07 16:53:40 +00:00
madmaxoft
e353f29d4a Plugin messages are received and handed to plugins. 
Note that MCS doesn't currently handle any channel registrations, this will come later on.
 2014-01-07 17:47:20 +01:00
Mattes D
a87daa969e Merge pull request #514 from derouinw/master 
Implement favicon for 1.7.2
 2014-01-07 08:41:13 -08:00
Bill Derouin
5012b81578 Avoid making copies of favicon string 2014-01-07 10:26:56 -06:00
madmaxoft
a33b157dc9 Disabled an unneeded MSVC warning. 
Also sorted the enabled warnings by their numerical code for easier searching..
 2014-01-07 17:15:08 +01:00
madmaxoft
8b9b09bf60 Removed a debugging log output in cPluginManager:AddHook(). 2014-01-07 17:07:49 +01:00
madmaxoft
39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
madmaxoft
bcd41dc1aa LuaState can push strings with embedded NULs. 
This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly.
 2014-01-07 17:07:48 +01:00
Bill Derouin
1c2eb4a1c0 A few more touch ups 2014-01-07 09:49:52 -06:00
Bill Derouin
ede6757f67 A few touch ups 2014-01-07 09:40:59 -06:00
Bill Derouin
5fd62f9cd7 Removed unused line 2014-01-07 09:38:51 -06:00
Bill Derouin
913841f501 Implement favicon for 1.7.2 
Favicon data is a png encoded in base64 which is stored in the server
and sent in the server response packet
 2014-01-07 09:31:06 -06:00
madmaxoft
934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
madmaxoft
e3bb82d95a Added Base64Encode(). 2014-01-07 12:36:36 +01:00
madmaxoft
778c329ad2 Disabled the type conversion MSVC warning. 
It was hitting way too many false positives.
 2014-01-06 22:23:03 +01:00
madmaxoft
9c8af58b75 Fixed a few MSVC warnings. 2014-01-06 22:22:33 +01:00
Mattes D
db978fc687 Merge pull request #511 from mc-server/CmakeOutput 
Output dir set to $/MCServer.
 2014-01-06 11:12:50 -08:00
Mattes D
6dd44e6230 Merge pull request #509 from Diusrex/master 
Added #pragma for warnings in MSVC warnings
 2014-01-06 09:15:41 -08:00
madmaxoft
0d5a5cc990 Exported cWorld::BroadcastBlockAction(). 
As requested in #508; no guarantees about it.
 2014-01-06 16:01:20 +01:00
madmaxoft
4b54f3e3ea Output dir set to $/MCServer. 
Ref.: #510.
 2014-01-06 10:13:19 +01:00
madmaxoft
c9c71fe5a7 Fixed wrong enqueueing. 
Fixes #505.
 2014-01-06 10:09:00 +01:00
Diusrex
487c1a24de Added fake functions into cCriticalSection because of the change to ASSERT 2014-01-05 15:08:30 -07:00
Diusrex
1acbf07445 Changed the release version of ASSERT. 
This was so a variable only used in ASSERT statements will not give a warning about not being used.
 2014-01-05 15:07:46 -07:00
Diusrex
2dbe5033ca Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h 
I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
 2014-01-05 15:06:17 -07:00
Diusrex
0d5b581fcd Making all of the useful level 4 warnings be active. 2014-01-05 14:42:22 -07:00
madmaxoft
84bf32f857 Fixed cPluginManager:AddHook() binding. 
Fixes #401. Old formats are still accepted, for compatibility reasons.
 2014-01-05 15:46:45 +01:00
madmaxoft
0a712931b1 Fixed a race condition in the cQueue class. 
Fixes #505.
 2014-01-05 15:15:59 +01:00
Tycho
d26c0e3815 Fixed Documentation 2014-01-03 09:42:35 -08:00
Tycho
13bbb3d99d derp 2014-01-03 08:56:20 -08:00
Tycho
14ec68d8d3 actual fix 2014-01-03 08:49:14 -08:00
Tycho
0e8bb3bf41 fixed failure to return a value from Remove 2014-01-03 08:34:41 -08:00
Tycho Bickerstaff
6f3c5b806e implement xsofts recommendations 2014-01-03 11:22:01 +00:00
Tycho Bickerstaff
ea6f94f6cb Merge branch 'master' into threadsafequeue 2014-01-02 17:49:55 +00:00
Tycho Bickerstaff
d522619ce2 added documentation 2014-01-02 17:43:57 +00:00
Tycho Bickerstaff
bbdb34252e fixed a few remaining issues with worldstorage 2014-01-02 17:37:34 +00:00
Mattes D
d3dc12815b Merge pull request #479 from mc-server/cmake-win 
Cmake-win
 2014-01-02 09:16:11 -08:00
madmaxoft
15dddc7701 More memory alignment fixes. 
Ref.: #420.
 2014-01-02 18:08:38 +01:00
madmaxoft
c510683d2a Fixed unaligned memory access in FastNBT. 
This should fix #420.
 2014-01-02 17:33:18 +01:00
Tycho Bickerstaff
042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Tycho Bickerstaff
7694a0788c Merge branch 'master' into threadsafequeue 
Conflicts:
	src/OSSupport/Queue.h
 2013-12-31 16:32:08 +00:00
Tycho Bickerstaff
c52a46a5e3 merged changes from upstream 2013-12-31 16:24:53 +00:00
madmaxoft
d4e29a0d18 Merge branch 'FishingHook' 2014-01-01 15:31:57 +01:00
STRWarrior
db00a36ff8 OnPlayerFishing doesn't have a const cItems anymore 2014-01-01 15:09:53 +01:00
andrew
852c52bee9 Fixed GetPhysicalRAMUsage on Linux 2014-01-01 11:18:56 +02:00
Tycho Bickerstaff
098ed91a48 fogot to add promise classes 2013-12-31 16:13:13 +00:00
Tycho Bickerstaff
512d1b9ebe clean up code for patching 2013-12-31 15:58:21 +00:00
Tycho Bickerstaff
18fb814c34 Merge branch 'master' into threadsafequeue 2013-12-31 15:53:17 +00:00
Tycho Bickerstaff
173ed0e653 Merge branch 'master' into cmake-fixes 2013-12-31 15:52:51 +00:00
Tycho Bickerstaff
f3736b1eb7 refactored chunk Queue to seperate class 2013-12-31 15:48:57 +00:00
STRWarrior
020a8b457d implemented the recommendations Xoft gave. 2013-12-31 14:53:10 +01:00
Tycho Bickerstaff
c3e34ee81a removed unneccisary cast 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
1957f982bc fixed warnings in LineBlockTracer.cpp 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
8e7e990cfe fixed warnings in LightingThread.cpp 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
3da41de553 take Z axis into account when calculating neighboors in LightingThread::ChunkReady 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
2e1588820d fixed warnings in World.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
2e113c63f9 fixxed warnings in Server.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
3152c72959 fixed warnings in Inventory.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
c83dfdb66e fixed warnings in bytebuffer.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
e41dec458c fixed ClientHandle warnings 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
9ebc623a0a fixed warnings in webadmin.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
25d42c44d5 fixed warnings in BlockArea.cpp 2013-12-31 09:16:40 +01:00
Morgan Redshaw
782818ffb5 Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. 2013-12-30 21:30:20 -07:00
STRWarrior
cd435ffca9 Implented OnPlayerFishing and OnPlayerFished. 2013-12-30 22:56:08 +01:00
madmaxoft
ee15d4e08e Fixed compilation in VC2008. 
Also removed an unused inline header file (yuck).
 2013-12-30 17:41:59 +01:00
madmaxoft
a1211bcdff Added support for out-of-source builds. 2013-12-28 14:42:11 +01:00
madmaxoft
90213d324a Merge branch 'master' into cmake-win 2013-12-27 11:53:12 +01:00
madmaxoft
1cf6502be2 Made cmake compilation possible on Windows. 2013-12-27 11:51:08 +01:00
Tiger Wang
f1142af455 Server now handles death messages 2013-12-26 14:55:19 +00:00
Mattes D
ac0c024e31 Merge pull request #472 from mc-server/Extreme_Hills_M 
Extreme hills
 2013-12-26 06:20:31 -08:00
madmaxoft
2560fb40c6 Added proper precompiled headers for MSVC. 2013-12-26 14:54:46 +01:00
STRWarrior
6884d4235e Simplefied Extreme Hills M pattern select. 2013-12-26 14:37:48 +01:00
madmaxoft
5689c00131 cBlockArea: Fixed writing full-height areas. 2013-12-26 10:59:01 +01:00
Mattes D
e0e01d0615 Merge pull request #461 from mc-server/repeaters 
Repeaters, pressure plates, and others
 2013-12-25 23:57:02 -08:00
Tiger Wang
d0572e73a0 Moved increment operator to back of variables 2013-12-26 00:12:06 +00:00
STRWarrior
b767fd784c Extreme Hills M biomes now generate gravel, stone and grass patterns. 2013-12-25 23:18:33 +01:00
STRWarrior
e282eb73c8 Changed tbGravel. Vanilla has 3 layers of gravel and then stone. 2013-12-25 23:05:22 +01:00
STRWarrior
caf3b6d70c Normal extreme hills (plus) now generate a stone/grass pattern. 2013-12-25 22:43:26 +01:00
STRWarrior
2f59a93f2a Re-added empty line. 2013-12-25 22:10:27 +01:00
STRWarrior
59b80c84fa This generates gravel in Extreme Hills M biomes. 2013-12-25 22:08:41 +01:00
Mattes D
abbb82d442 Merge pull request #471 from mc-server/Fishing_Catapult 
You are now able to sweep mobs to your position using fishing rods.
 2013-12-25 11:48:26 -08:00
madmaxoft
77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
madmaxoft
c2befd9777 Fixed block area height check. 
The block area couldn't be read up to chunk height.
 2013-12-25 19:39:07 +01:00
tonibm19
4cee3d8fe3 (Hopefully) fixed if conditions 2013-12-25 19:32:45 +01:00
STRWarrior
5eacf327b7 Fixed Parentheses. 2013-12-25 18:14:00 +01:00
STRWarrior
17a84111ce You are now able to sweep mobs to your position using fishing rods. 2013-12-25 17:26:17 +01:00
Tiger Wang
548273c8f7 Preliminary mobile entity saving 
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
 2013-12-25 16:07:52 +00:00
tonibm19
6b6b6e7498 Implemented xoft suggestion (partly) 
I only get it working in first condition. It seems it's not compatible with else if...
 2013-12-25 16:59:26 +01:00
Tiger Wang
1a02d94ed2 Fixed rails not updating with diagonals 2013-12-25 14:12:48 +00:00
Tiger Wang
40c2826a21 Braced up some code 2013-12-25 14:05:37 +00:00
Tiger Wang
508e505ace Used IsGamemodeCreative() function 2013-12-24 23:47:04 +00:00
tonibm19
258bb45880 BLOCKTYPE... 2013-12-24 19:31:32 +01:00
tonibm19
96c94a79a7 Fixed compilation 2013-12-24 19:25:34 +01:00
tonibm19
e3f89400d8 Implemented xoft suggestion 2013-12-24 19:13:18 +01:00
tonibm19
276f7dae5c Using BLOCKTYPE instead of int 2013-12-24 19:08:22 +01:00
tonibm19
59f8068cf4 Fixed comments 2013-12-24 18:41:49 +01:00
tonibm19
85fc1478fa Changed a little how detection works and added comments. 2013-12-24 18:37:09 +01:00
tonibm19
c06388aa4a Storing Y -1 and -2 blocks in a variable 2013-12-24 18:07:33 +01:00
Tiger Wang
9e5e415674 Merge pull request #469 from mc-server/Android_Update 
Android update
 2013-12-24 08:20:55 -08:00
Tiger Wang
ae6cb01e56 Fixed comments in main.cpp and Player.cpp 2013-12-24 15:16:30 +00:00
Tiger Wang
c6314e8935 Implemented stone and wooden pressure plates 2013-12-24 15:02:55 +00:00
Tiger Wang
89f87f66a5 Improved knockback animation 
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
 2013-12-24 15:02:35 +00:00
STRWarrior
b424877448 Fixed getting configure button going to port 0. 2013-12-24 14:44:24 +01:00
Alexander Harkness
200f37c41f removed the function def also 2013-12-24 13:26:54 +00:00
Alexander Harkness
e1d3b201bd Finally removed the function. 2013-12-24 13:25:58 +00:00
tonibm19
5e24577373 Using parenthesis 2013-12-24 12:35:40 +01:00
tonibm19
84bfffcc15 Fixed a possible crash 2013-12-24 12:23:20 +01:00
Alexander Harkness
8c91f7062a fixed compile? 2013-12-24 10:36:06 +00:00
Alexander Harkness
af6389ea7a finally removed them all? 2013-12-24 10:30:36 +00:00
Alexander Harkness
8674c6800f updated another file... 2013-12-24 10:29:18 +00:00
Alexander Harkness
b397dc438b Updated MakeColour's defenition in the header. 2013-12-24 10:24:08 +00:00
Alexander Harkness
085008ff8c Update as per xoft's instructions. 2013-12-24 10:17:44 +00:00
Alexander Harkness
be79d12966 Update chat colours 
@madmaxoft, is this right? fixes #467
 2013-12-24 10:14:33 +00:00
madmaxoft
5bbe72bc90 Replaced esCreeper with esMonster. 
Any monster will be able to explode, and also this fixes #425.
 2013-12-23 22:36:22 +01:00
Tiger Wang
1014c737a4 Improved player fall particle positions 2013-12-23 21:18:01 +00:00
Tiger Wang
76444470a4 Provides an enhancement to daylight sensors 2013-12-23 15:22:05 +00:00
tonibm19
99ade2fa12 Improved iron golem detection algorithm 
- You need to make it like in vanilla
- Only used blocks are removed
 2013-12-23 12:00:08 +01:00
Tiger Wang
9c796bf6b4 Clarified some code in Player.cpp 2013-12-23 09:51:41 +00:00
Tiger Wang
d8221854d2 Fixed a comment in Entity.cpp 2013-12-23 09:41:45 +00:00
Tiger Wang
003043f8ab Added some comments in main.cpp 2013-12-23 09:41:34 +00:00
tonibm19
c6946fb8c4 Some fixes (SEE DESC) 
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
 2013-12-23 10:32:49 +01:00
tonibm19
b95ee2d230 You can now spawn iron golems. 
You can spawn them like in vanilla.
 2013-12-23 10:26:45 +01:00
Tiger Wang
11fbfb458d Daylight sensor sensing enhancement 2013-12-22 23:20:43 +00:00
Tycho Bickerstaff
d0cd9a2b36 added link dependency between WorldStorage and OSSupport 2013-12-22 22:52:21 +00:00
STRWarrior
5af74fe77c Fixed bug where snowgolems could replace non-solid blocks to snow blocks. 2013-12-22 21:12:34 +01:00
Tiger Wang
48b388aa97 A fix for daylight sensors 2013-12-22 20:06:15 +00:00
Tiger Wang
b02a81678c Implemented knockback and critical hit 2013-12-22 20:04:17 +00:00
Tiger Wang
43e8196309 Added many event catchers 
* Window close
* CTRL-C
* etc.
 2013-12-22 20:03:58 +00:00
Tiger Wang
945ba36d1b Implemented fall particles 2013-12-22 20:03:09 +00:00
STRWarrior
5a9b26d322 Snow golems die in hot biomes and leave a snow trail. 2013-12-22 20:40:07 +01:00
STRWarrior
4115724736 You can spawn snow golems with snow blocks and pumpkins. 2013-12-22 20:15:56 +01:00
STRWarrior
488d7ddd7d EnderDragons and SnowGolems are able to spawn. 2013-12-22 20:15:09 +01:00
STRWarrior
05c670dc50 Fixed cacus breaking when next to any non-air block. 2013-12-22 18:37:56 +01:00
Tycho Bickerstaff
75abce905d fixed bad merge 2013-12-22 16:33:40 +00:00
Tycho Bickerstaff
10e5540f98 merged in more warning fixes 2013-12-22 16:25:02 +00:00
Tycho Bickerstaff
a295e0c342 merged in changes 2013-12-22 16:22:25 +00:00
Tycho Bickerstaff
09b9661fff Merge branch 'master' into threadsafequeue 2013-12-22 16:14:34 +00:00
Tycho Bickerstaff
15a980a616 merged in warnings changes 2013-12-22 16:11:34 +00:00
Tycho Bickerstaff
a7a4b2886d fixed accedental commit 2013-12-22 15:55:57 +00:00
Tycho Bickerstaff
a71299c46b fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not 2013-12-22 15:41:01 +00:00
Tycho Bickerstaff
1a9d93665f Merge remote-tracking branch 'upstream/master' into threadsafequeue 2013-12-22 15:21:34 +00:00
madmaxoft
248ba1ea9f Added HOOK_PLUGINS_LOADED. 
This fixes #482.
 2013-12-29 12:51:58 +01:00
Mattes D
d40ed86907 Merge pull request #481 from MikeHunsinger/master 
Added function to create large birch tree images in birch forests
 2013-12-29 00:04:08 -08:00
Mike Hunsinger
b93b4c4825 Added function to create Tall Birch tree in BirchTreeForest biomes 2013-12-28 23:49:51 -07:00
madmaxoft
725b997a28 Fixed a (valid) warning in RCONServer. 2013-12-28 22:00:01 +01:00
STRWarrior
318dc76fc9 Made the lure enchantment work. 2013-12-22 16:03:11 +01:00
madmaxoft
dfa81829fe Fixed signedness warning in cItemGrid. 2013-12-22 15:45:45 +01:00
STRWarrior
5f18abaa27 Fixed compiler warning. 2013-12-22 15:30:47 +01:00
STRWarrior
8d51c22b36 Fishing underground is slower and fishing while raining is faster. 2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46 Fixed compiler warnings. 2013-12-22 14:54:07 +01:00
STRWarrior
9de847c9b1 Countdown time is between 100 and 900 ticks. 2013-12-22 14:51:19 +01:00
STRWarrior
7a299f1ba6 Fishing now uses a countdown instead of a random number each tick. 2013-12-22 14:48:22 +01:00
Tycho Bickerstaff
d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
STRWarrior
e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
Tycho Bickerstaff
94ca07cfbf Merge branch 'master' of github.com:mc-server/MCServer 2013-12-22 13:19:27 +00:00
Tiger Wang
acb5a36a6a Daylight sensors 2013-12-22 00:33:22 +00:00
Tiger Wang
5b2ac381b6 Fixed them again, confound it 2013-12-22 00:30:21 +00:00
STRWarrior
c676216791 Using regular assignments. 2013-12-21 22:20:54 +01:00
STRWarrior
76ff71810a Once again better Y direction for the items given when fishing. 2013-12-21 20:42:43 +01:00
STRWarrior
f244dbfb12 You are now able to get different items from fishing. 2013-12-21 19:58:52 +01:00
madmaxoft
abd1ca4fef Bindings regen script updated. 
The Bindings.cpp / .h files are no longer stored in the git repo.
 2013-12-21 19:30:16 +01:00
STRWarrior
bd6574230a Floater now dissapears when the player doesn't have an fishing rod equipped. 2013-12-21 17:31:05 +01:00
Tycho Bickerstaff
b3046a09e5 Chunk is now warnings clean 2013-12-21 15:58:21 +00:00
Tycho Bickerstaff
3289abde73 fixed hidden bug with furnaces ignoring time burnt 
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
 2013-12-21 15:49:59 +00:00
Tycho Bickerstaff
9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
5034ae29b8 Piston is now warnings clean 2013-12-21 15:08:01 +00:00
Tycho Bickerstaff
38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
14d2085e35 basic threadsafe queue interface 2013-12-21 14:43:32 +00:00
Tycho Bickerstaff
b4fb8ace03 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-21 13:33:09 +00:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
STRWarrior
128de10a2f You could now only get fish from non-source blocks. Fixed it. 2013-12-21 14:11:21 +01:00
STRWarrior
3c73076be4 Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. 2013-12-21 14:08:58 +01:00
STRWarrior
8efde94e4e Fixed bug where you could get fish from non-source blocks. 2013-12-21 14:07:32 +01:00
Tiger Wang
432a28d935 Fixed repeaters delay, maybe 
Also added basic daylight sensors, though because GetBlockSkylight
always is 15, it doesn't work.
 2013-12-20 21:19:13 +00:00
STRWarrior
9c575681f8 Merge branch 'master' of https://github.com/mc-server/MCServer 2013-12-20 19:50:47 +01:00
STRWarrior
6afe6b7928 Increased the range an Floater can shoot to. 2013-12-20 19:49:30 +01:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
STRWarrior
61120686c6 Fish now actualy jumps to the player instead of a few block bellow them. 2013-12-20 18:35:13 +01:00
STRWarrior
af98fc6170 Fixed bug where the floater could pop in the water while you could already get a fish. 2013-12-20 18:34:08 +01:00
madmaxoft
8570d08eb4 More reordering fixes. 2013-12-20 17:11:51 +01:00
tycho
f739246e52 added precompiled headers 2013-12-20 16:05:12 +00:00
madmaxoft
fc97cb8c58 Fixed a typo in cBlockArea merging code. 2013-12-20 16:48:45 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
tycho
f6d5a788aa fixed include of math on windows 2013-12-20 15:37:35 +00:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft
eabb88eb74 Fixed minor warnings. 2013-12-20 16:22:16 +01:00
madmaxoft
b66722f735 Fixed warnings in HTTP parser. 2013-12-20 16:20:54 +01:00
madmaxoft
812375fab1 Attempt at fixing cChunkDef::Height signedness. 2013-12-20 16:15:39 +01:00
madmaxoft
b6e4d2c263 Properly fixed warnings in cFastRandom. 2013-12-20 16:11:25 +01:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
madmaxoft
b19d765666 Fixed melon and pumpkin growing. 2013-12-20 15:50:46 +01:00
madmaxoft
00911c5f94 Fixed missing parenthesis. 2013-12-20 15:44:56 +01:00
madmaxoft
ea65243119 Fixed clang warnings in Noise.cpp. 
Fix-a-random-warning-per-day :)
 2013-12-20 10:11:33 +01:00
Tiger Wang
c08910d4af Fixed assertion during dirt block OnUpdate() 2013-12-19 23:06:26 +00:00
Mattes D
39251bccd3 Merge pull request #450 from mc-server/redstonefixes 
Multiple fixes
 2013-12-19 13:58:49 -08:00
STRWarrior
a1ce0a6d73 Fixed #include in Floater.cpp. 2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498 The floater now actualy dives under water. 2013-12-19 22:18:05 +01:00
STRWarrior
018c65b4e3 You can get fish from fishing :D. Only one type of fish though. 2013-12-19 22:16:15 +01:00
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +00:00
Tycho Bickerstaff
cb9f30d4ee Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-19 17:21:29 +00:00
tycho
162b085d80 fixed include paths on windows and added build dir to gitignore 2013-12-20 00:31:52 +00:00
tycho
c7d766bbcc fixed compile errors with headers and math library 2013-12-20 00:22:06 +00:00
tycho
7735a956f0 Merge branch 'master' into cmake 2013-12-20 00:13:04 +00:00
tycho
44638cd24a fixed multiprocessing on windows and removed redundend compile of headers 2013-12-19 23:37:24 +00:00
Tycho Bickerstaff
fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00:00
STRWarrior
d9c8ae37cf Implented cItemFishingRodHandler. 2013-12-19 17:34:03 +01:00
STRWarrior
3d70d7198d Implented IsFishing, SetIsFishing and GetFloaterID(). 2013-12-19 17:33:21 +01:00
STRWarrior
86bfed735e Added cFloater class. 2013-12-19 17:32:06 +01:00
Tycho Bickerstaff
0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
Tiger Wang
53e8c067ea Fixed 1.7 arm swing animation 2013-12-19 16:03:43 +00:00
Tiger Wang
53ff372624 Fixed dust from being placed on nonsolids 2013-12-19 15:57:35 +00:00
Tiger Wang
b083979cb2 Fixed repeaters not updating power 2013-12-19 15:57:15 +00:00
tycho
7d096c41f7 fixed a number of windows issues 2013-12-19 15:07:45 +00:00
Tycho Bickerstaff
95c7407dd3 added md5 as a dependency for bindings 2013-12-19 00:55:01 +00:00
Tycho Bickerstaff
e2549dfcb2 added expat as lua bindings dependincy 2013-12-19 00:52:52 +00:00
Tycho Bickerstaff
afa259e530 added all cpp files to bindings 2013-12-19 00:24:47 +00:00
Tycho Bickerstaff
d2f29cb866 moved HTTPServer to globs 2013-12-19 00:16:44 +00:00
Tycho Bickerstaff
e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff
0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff
3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff
9515ece2bd linked in lua 2013-12-19 00:02:15 +00:00
Tycho Bickerstaff
cdca5a3eac Merge branch 'master' into cmake 2013-12-19 00:00:14 +00:00
Tycho Bickerstaff
7dd1561a88 fixed bindings generation 2013-12-18 23:59:07 +00:00
Tycho Bickerstaff
0dbd55614b bindings regenration logic 2013-12-18 23:14:11 +00:00
Tiger Wang
2dd823da09 Disconnection message no longer shown if ping 2013-12-18 22:06:36 +00:00
Tiger Wang
b4ac4a14fa Prettified command error messages 
Using the magic of overlords (overloads) and standards compliance.
 2013-12-18 22:05:41 +00:00
Tycho Bickerstaff
95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff
e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
Tiger Wang
aaaa53ce9d The "<>" of a player name is now coloured 2013-12-18 18:18:06 +00:00
Tiger Wang
26632bbb8a Fixed 1.7 player disconnection not calling hook 
This fixes #357
 2013-12-18 18:17:17 +00:00
Mattes D
acf90a2c1a Merge pull request #440 from mc-server/repeaterfixes 
Fixed redstone wire and certain repeater scenarios
 2013-12-18 09:59:31 -08:00
Mattes D
b6e1f62df7 Merge pull request #442 from mc-server/Nether_Wart 
Implented Nether Wart.
 2013-12-18 09:58:41 -08:00
STRWarrior
ffca4f94c1 Implented Nether Wart. 2013-12-18 18:33:18 +01:00
Tiger Wang
db5d7963e2 Renamed back EntityAnimation to PlayerAnimation 
This fixes #411 and partially reverts
30ead79049
 2013-12-18 16:11:15 +00:00
madmaxoft
4402725c61 Removed offending tr1/memory header inclusion. 
We already use <memory> at line 160, this was a double include, additionally causing problems (#424).
 2013-12-18 12:04:31 +01:00
Tiger Wang
13a22918e5 Fixed wire powering blocks beneath 2013-12-17 23:05:42 +00:00
Tiger Wang
09c47fabd2 Fixed bad repeater power queuing in corner case 
Repeaters remain queued to power even if their original source has since
unpowered. Also functionised and cleaned up code.
 2013-12-17 23:05:27 +00:00
madmaxoft
f8f4ab88f6 Fixed player falling through the floor on spawn. 
The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
 2013-12-17 20:16:06 +01:00
madmaxoft
bd568ed089 cBlockArea: origin is initialized in the constructor and the loader. 2013-12-17 20:16:06 +01:00
madmaxoft
a4f4ba534e Fixed naming and initialization. 2013-12-17 20:10:03 +01:00
STRWarrior
a74fdd9023 Forgot to change one Vector3d to Vector3i. 2013-12-17 20:04:39 +01:00
STRWarrior
a1bfc89118 Renamed Pos to m_Pos. 2013-12-17 20:02:44 +01:00
STRWarrior
f1a1d6fa5c Using Recommendations. 2013-12-17 19:42:06 +01:00
STRWarrior
d28142ff71 Made buckets work when the player does not 'look' at a block. This fixes #265 2013-12-17 17:33:48 +01:00
Tiger Wang
ed80ff9fc8 Merge pull request #438 from mc-server/Boats 
Implemented boating functionality.
 2013-12-16 14:14:44 -08:00
madmaxoft
daade8ddee Fixed multiple inheritance in ToLua++. 
This fixes #422.
 2013-12-16 22:13:46 +01:00
STRWarrior
59165dcba5 Boats spawn on top of a block. not between 4 blocks. 2013-12-16 21:50:57 +01:00
STRWarrior
6b21dc6d11 Using suggestions for Boat placing. 2013-12-16 20:53:43 +01:00
Tiger Wang
3e6fd5c6e5 Removed some old cRedstone remnants 2013-12-16 17:35:20 +00:00
STRWarrior
199123d4f2 Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. 2013-12-16 18:03:39 +01:00
STRWarrior
459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
STRWarrior
324fa55bf0 You can spawn boats on water. 2013-12-16 18:01:33 +01:00
madmaxoft
f521cbeb31 Fixed cClientHandle::Tick() being called from two threads. 
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187.
 2013-12-16 10:41:51 +01:00