Ambushed91
|
811c10625a
|
Update style.css
|
2014-10-23 20:59:00 +02:00 |
|
Ambushed91
|
8d941212ed
|
Update guest.html
|
2014-10-23 20:55:49 +02:00 |
|
Ambushed91
|
c23d87277d
|
Update WebAdmin
All files have been updated to the latest version off the new WebAdmin
look.
|
2014-10-23 19:59:49 +02:00 |
|
Mattes D
|
32cab75e43
|
IniFile: Removed an unused macro.
|
2014-10-23 16:07:43 +02:00 |
|
Mattes D
|
298be25413
|
QtBiomeVisualiser: Moved the IniFile lib.
|
2014-10-23 15:29:02 +02:00 |
|
Mattes D
|
1235ccb1e2
|
Removed iniFile library from linux dependencies.
|
2014-10-23 15:26:43 +02:00 |
|
Mattes D
|
449d08cb3d
|
Merged IniFile into main MCS sources.
|
2014-10-23 15:15:10 +02:00 |
|
Howaner
|
72bb299a4a
|
Merge branch 'master' into ChunkLoader
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
|
2014-10-23 14:59:42 +02:00 |
|
Mattes D
|
07bbfd5894
|
Fixed a crash in redstone simulator.
|
2014-10-23 12:51:59 +02:00 |
|
Mattes D
|
154c329a25
|
Removed the "conditional expression is constant" warning.
MSVC spits out many of these on its own std libraries.
|
2014-10-23 10:58:41 +02:00 |
|
Mattes D
|
ed7a0332f6
|
Merge pull request #1562 from mc-server/signplace
Signs can be placed on wallsigns.
|
2014-10-23 09:46:51 +02:00 |
|
Alexander Harkness
|
57f822cd0e
|
Signs can be placed on wallsigns.
Fixes #1438
|
2014-10-23 08:07:20 +01:00 |
|
Mattes D
|
4bfd2c9707
|
Merge pull request #1559 from mc-server/nullptr
En masse NULL -> nullptr replace
|
2014-10-23 08:29:31 +02:00 |
|
Tiger Wang
|
a26541a7c3
|
En masse NULL -> nullptr replace
|
2014-10-22 20:12:49 -07:00 |
|
Mattes D
|
2ac3a807b7
|
ComposableGenerator: Removed nullptr initializers.
|
2014-10-22 22:58:36 +02:00 |
|
Alexander Harkness
|
782e466ca1
|
Upgraded core.
|
2014-10-22 15:27:01 +01:00 |
|
Mattes D
|
7ed27c6b80
|
LuaState: Projectiles are pushed using their full class.
|
2014-10-22 16:06:32 +02:00 |
|
Mattes D
|
bfd1a9601a
|
APIDump: Added docs for a few projectiles.
|
2014-10-22 16:06:31 +02:00 |
|
Alexander Harkness
|
7cda6f9346
|
Clearer version indication.
|
2014-10-22 13:55:21 +01:00 |
|
Mattes D
|
1cd45e770d
|
Added inheritance information to Lua docs for projectiles.
|
2014-10-21 23:11:45 +02:00 |
|
Mattes D
|
b979cad893
|
cItemFrame: Fixed a forgotten rename.
|
2014-10-21 22:32:17 +02:00 |
|
Mattes D
|
814e4404bb
|
Merge pull request #1515 from mc-server/BlockFixes
Block fixes
|
2014-10-21 22:04:51 +02:00 |
|
Mattes D
|
a42fa071bc
|
Properly exported cItemFrame and cHangingEntity to Lua.
|
2014-10-21 22:02:30 +02:00 |
|
Mattes D
|
881bc66233
|
Fixed trailing whitespace.
|
2014-10-21 22:00:31 +02:00 |
|
Mattes D
|
0c0c762412
|
Exported individual projectile classes to Lua API.
They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list.
|
2014-10-21 21:25:52 +02:00 |
|
Howaner
|
6f99615ceb
|
Merge branch 'master' into ChunkLoader
Conflicts:
src/World.h
|
2014-10-21 21:16:04 +02:00 |
|
Howaner
|
4fe41839cc
|
Reverted hook move.
|
2014-10-21 21:13:35 +02:00 |
|
Howaner
|
2d63967551
|
style.
|
2014-10-21 18:32:02 +02:00 |
|
Howaner
|
5d3b6c212f
|
Reverted plugin remove
|
2014-10-21 18:30:59 +02:00 |
|
Howaner
|
690e89001e
|
Fixed submodule downgrades
|
2014-10-21 18:13:14 +02:00 |
|
Mattes D
|
bcb839d07b
|
Merged branch 'master' of git://github.com/sriehl/MCServer
|
2014-10-21 18:12:40 +02:00 |
|
Howaner
|
f800f3c998
|
Moved tall grass pickups handle.
|
2014-10-21 18:06:44 +02:00 |
|
Howaner
|
283eda3c4e
|
Merge branch 'master' into BlockFixes
|
2014-10-21 17:37:03 +02:00 |
|
Howaner
|
b0988e65aa
|
Use two lists and 2 chunk send prioritys.
|
2014-10-21 17:35:23 +02:00 |
|
Howaner
|
a07456d712
|
New c++11 stuff.
|
2014-10-21 17:00:41 +02:00 |
|
Howaner
|
44514e53fc
|
Merge branch 'master' into ChunkLoader
Conflicts:
src/ClientHandle.cpp
|
2014-10-21 16:55:22 +02:00 |
|
Tiger Wang
|
bc97399b01
|
Updated ProtectionAreas
|
2014-10-21 13:44:33 +01:00 |
|
Mattes D
|
dc4185fb86
|
cLuaState: cEntity is pushed with specific type.
|
2014-10-21 12:43:06 +02:00 |
|
Mattes D
|
ac80f62650
|
Updated the Core.
|
2014-10-20 20:23:38 +02:00 |
|
Mattes D
|
d79d5945e3
|
InfoDump: Do not crash if one plugin fails to load.
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
|
2014-10-20 20:14:00 +02:00 |
|
Alexander Harkness
|
b025bb63c2
|
Merge pull request #1554 from SphinxC0re/master
Fixed #1550
|
2014-10-20 18:49:16 +01:00 |
|
Julian Laubstein
|
48470c858b
|
Fixed #1550
|
2014-10-20 19:36:16 +02:00 |
|
Mattes D
|
b78078a3a6
|
Fixed a potential crash in cEntity bindings.
|
2014-10-20 17:32:09 +02:00 |
|
Alexander Harkness
|
1f301d7560
|
Merge pull request #1553 from SphinxC0re/work
Fix for fix #1552
|
2014-10-20 15:15:59 +01:00 |
|
Julian Laubstein
|
4a58ce1df6
|
Found it!
|
2014-10-20 16:00:33 +02:00 |
|
Julian Laubstein
|
d2cc1e0cd3
|
Fix for fix #1552
|
2014-10-20 15:58:08 +02:00 |
|
Alexander Harkness
|
bf8de85fd6
|
Merge pull request #1552 from SphinxC0re/master
Added error handling to load <plugin> command
|
2014-10-20 14:34:19 +01:00 |
|
Julian Laubstein
|
c2560cc1be
|
Added error message
|
2014-10-20 15:08:48 +02:00 |
|
Julian Laubstein
|
1a46feda43
|
Added error handling to load <plugin> command
|
2014-10-20 14:46:24 +02:00 |
|
Mattes D
|
8fbd65e775
|
Merge pull request #1549 from SphinxC0re/master
Added mechanics placeable on halfslabs
|
2014-10-19 19:13:48 +02:00 |
|