1
0
Commit Graph

3789 Commits

Author SHA1 Message Date
madmaxoft
caea934d37 CMake: Lua DLL is built in the correct folder.
Also removed SCL warnings from MSVC builds.
2014-01-13 10:59:37 +01:00
Tiger Wang
edefa27a48 Detaching improvements
* Players now search for an area around themselves to teleport to when
detaching from something
2014-01-12 23:23:36 +00:00
Tiger Wang
1d81db6446 Fixed wire, rail, and pressure plate unpowering 2014-01-12 23:19:08 +00:00
STRWarrior
c7d556afaf Fixed server crash. 2014-01-12 18:15:54 +01:00
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
Tiger Wang
e932c69b82 Fixed VS2013 compile and updated Core 2014-01-12 13:59:39 +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
Mattes D
83bdbafaa3 Merge pull request #533 from mc-server/CmakeMultiConfig
Cmake multi config
2014-01-12 01:14:24 -08:00
madmaxoft
50956d55ae Ignore Win32 .idb files. 2014-01-12 10:10:20 +01:00
madmaxoft
180b9b9099 Merge branch master into CmakeMultiConfig. 2014-01-12 10:04:16 +01: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
Mattes D
1ec9eb564c Merge pull request #526 from mc-server/IniFileFix
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -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
madmaxoft
7fa5217aad Fixed the warning in CryptoPP.
It was getting on my nerves too much, decided to actually fix their code.
2014-01-11 20:27:07 +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
madmaxoft
7739238d3d Fixed reading the files.
Duplicate values were ignored.
2014-01-11 20:10:50 +01:00
madmaxoft
2e0fcbdcb7 Documented the cIniFile:AddValue* functions.
Now the documentation really matches the implementation.
2014-01-11 16:50:52 +01:00
madmaxoft
a332a5dc73 IniFile: Split SetValue() into AddValue() and SetValue().
Each function does what one would assume - AddValue adds a new value, SetValue overwrites existing value (creates a new one if not exists, if instructed to do so).
2014-01-11 16:44:28 +01:00
Mattes D
7a55f91be2 Merge pull request #531 from xdot/master
Fixed glowstone drop count
2014-01-11 06:52:48 -08:00
Tiger Wang
ff57381631 Did some stuff with the vectors 2014-01-11 14:26:18 +00:00
madmaxoft
37025fca77 Merge branch 'master' into IniFileFix 2014-01-11 13:03:51 +01: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
Mattes D
e213769216 Merge pull request #522 from mc-server/LuaDlFix
Lua dl fix
2014-01-10 08:27:43 -08: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
Bill Derouin
0a72390587 Added files to VC2013 project file 2014-01-10 09:33:48 -06: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
madmaxoft
4c360b54e3 Fixed cIniFile's SetValue().
How did we not see this earlier? Each call to SetValue would actually ADD a value!
2014-01-10 16:23:22 +01: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