1
0
Commit Graph

1347 Commits

Author SHA1 Message Date
madmaxoft
0984cf9deb Added Vector3::Move(const Vector3 &). 2014-03-25 21:59:41 +01:00
Mattes D
cac5149974 Merge pull request #833 from mc-server/EnderCrystal
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Mattes D
c6186acf58 Merge pull request #828 from mc-server/Wither
Wither invulnerability
2014-03-25 08:54:13 +01:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
Mattes D
9226b8480e Merge pull request #829 from Howaner/Cake
Add log pickups.
2014-03-24 22:13:25 +01:00
Howaner
a6414d3348 Add log pickups. 2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft
fd8e5bf551 Updated the ToLua windows executable. 2014-03-23 20:54:37 +01:00
madmaxoft
c9163d39f7 Implemented faster upscaling using templates.
Fixes #819.
2014-03-21 22:53:46 +01:00
madmaxoft
20fc7d6aea Updated the tolua++ executable for Win builds. 2014-03-20 22:41:12 +01:00
madmaxoft
62f84d968a Merge branch 'unreachable' 2014-03-20 22:36:24 +01:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069 Rewritten player speeds to be relative unit-less.
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
madmaxoft
b1ad3322e5 Fixed code style after recent merge. 2014-03-20 09:28:29 +01:00
madmaxoft
964647a900 Made pushing plain pointer to Lua a valid operation, with a warning.
This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning)
2014-03-20 09:16:47 +01:00
Mattes D
fe6c03595f Merge pull request #790 from mc-server/awesometnt
TNT Shrapnel
2014-03-20 09:05:53 +01:00
Tiger Wang
3e49cada80 Added braces 2014-03-19 23:07:58 +00:00
Tiger Wang
a0720a65d6 Minor Entity.cpp cleanup 2014-03-19 23:07:16 +00:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
madmaxoft
74b7f51b89 Errors in Lua don't include the error handler in the stack trace.
Fixes #817.
2014-03-19 22:55:47 +01:00
Tycho
1635c696de Merge branch 'master' into unreachable 2014-03-19 12:13:05 -07:00
Tycho
363c92ed53 Added unreachable lines backit prtected by preprocessor guards 2014-03-19 12:06:12 -07:00
madmaxoft
4a67114f56 LuaChunkStay: Removed a debugging output. 2014-03-19 13:57:06 +01:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft
91f64da2a6 Fixed chunkmap tree block replacing. 2014-03-18 15:45:16 +01:00
madmaxoft
4dc5650023 Fixed cGZipFile::ReadRestOfFile returning incorrect value. 2014-03-18 13:54:17 +01:00
madmaxoft
9447cd20f3 Fixed a crash in firework rockets.
Fixes #816.
2014-03-17 22:12:02 +01:00
Tycho
90ab055eab Merge branch 'master' into unreachable 2014-03-17 09:44:34 -07:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
madmaxoft
260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
c5740c27a9 Wrong if in BlockLeaves 2014-03-16 21:39:01 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
madmaxoft
ef50e73a9c Added common eMessageType aliases. 2014-03-16 21:37:33 +01:00
Howaner
96d80f981e Change if-clause in BlockCake.h 2014-03-16 20:57:23 +01:00
Howaner
4ec5a95a7a Add cake 2014-03-16 20:26:13 +01:00
Howaner
568038ab52 Fix anvil pickups. 2014-03-16 19:25:00 +01:00
Howaner
4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
Tycho
04f1d58561 Fixed unessicary return 2014-03-15 07:08:09 -07:00
Tycho
fbd4d53dac Merge branch 'master' into unreachable
Conflicts:
	SetFlags.cmake
2014-03-15 06:47:56 -07:00
Tycho
2e9fe777e4 Patched tolua to emit range checks for enums 2014-03-15 06:45:26 -07:00
Howaner
d6edd5f24e Remove old debug messages. 2014-03-15 11:53:55 +01:00
Mattes D
50b53ff3e8 Merge pull request #800 from mc-server/EntireCommandError
The entire unknown command is echoed back to the user on error.
2014-03-15 07:52:37 +01:00
madmaxoft
0442c41c87 Added cCuboid:Assign(OtherCuboid) API function. 2014-03-15 07:50:39 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00