Howaner
b8769e3fb4
Merge branch 'master' into WebAdmin
2014-09-02 19:37:03 +02:00
DayBr3ak
b8636ee53a
forgot this one
2014-09-02 18:18:43 +02:00
DayBr3ak
82911f3662
opting for size_t
2014-09-02 18:13:24 +02:00
DayBr3ak
29811c4f21
fixing memory leak
2014-09-02 18:05:53 +02:00
DayBr3ak
ac4ec5117d
changing implem, using vectors
2014-09-02 10:54:26 +02:00
madmaxoft
4837d41368
Re-added alternate spellings of darkgraywool.
2014-09-02 08:35:58 +02:00
madmaxoft
7fb9cbcfb2
Re-updated the Core.
2014-09-02 08:34:23 +02:00
madmaxoft
32c7336c1c
Merge remote-tracking branch 'masy/blocks'
2014-09-02 08:31:48 +02:00
DayBr3ak
d9afe6dd65
adding config file entry #381
2014-09-02 01:19:52 +02:00
DayBr3ak
77409d47eb
adding the multicache behavior
2014-09-02 01:13:19 +02:00
madmaxoft
b1da567f3d
Pickups combine only within one chunk.
...
This greatly improves performance of the tick thread.
2014-09-01 21:43:03 +02:00
DayBr3ak
7695471ff9
added multicache class definition
2014-09-01 21:37:36 +02:00
Masy98
8f58cc50dd
Added missing leather recipe!
2014-09-01 21:34:04 +02:00
madmaxoft
d9f6c691cc
CopyBlocks test: decreased the test size.
...
It just needlessly ate up test time; there's no need for such rigorous testing once the test started succeeding.
2014-09-01 21:31:27 +02:00
Masy98
cc9acd13b9
Merge branch 'master' into blocks
...
Conflicts:
MCServer/furnace.txt
MCServer/items.ini
2014-09-01 21:30:45 +02:00
madmaxoft
6f18d01b51
Fixed off-by-one errors in cChunkDef asserts.
2014-09-01 21:17:22 +02:00
Mattes D
3093f3d180
Merge pull request #1368 from mc-server/coverityFixes
...
Make sure packets are valid
2014-09-01 20:57:55 +02:00
worktycho
de30a8c8c6
Make sure packets are valid
...
Fixes CID 66408, 66409 and 72045
2014-09-01 18:18:07 +01:00
Masy98
9674224e32
Fixed spacing and light gray wool name!
2014-09-01 19:08:29 +02:00
madmaxoft
022f5f141d
Fixed Bindings regeneration under MSVC.
2014-09-01 16:10:40 +02:00
LO1ZB
4c9abab2d1
fix possibility of a twice generated chunk
2014-09-01 15:01:56 +02:00
madmaxoft
8821c476bb
Fixed previous commit's wrong assumptions.
...
The equipment-getting functions return a copy already, so we can't take a pointer, really.
2014-09-01 14:35:52 +02:00
madmaxoft
7d8a474f13
Fixed MSVC compilation, improved performance.
...
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
2014-09-01 14:31:05 +02:00
madmaxoft
f22f67a63c
Fixed MSVC warning.
2014-09-01 14:29:13 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
madmaxoft
ea39c1d21c
Avoid false positive in style check.
2014-09-01 13:43:10 +02:00
Mattes D
74204aed6c
Merge pull request #1365 from mc-server/coverityFixes
...
Coverity fixes
2014-09-01 13:41:20 +02:00
madmaxoft
1e60265a90
Fixed style.
2014-09-01 13:33:17 +02:00
Mattes D
78b7d0006a
Merge pull request #1363 from mc-server/FurnaceRecipes
...
Rewritten furnace.txt loading
2014-09-01 09:00:51 +02:00
Howaner
959f89f5bc
Fixed ReplaceString() documentation.
2014-09-01 00:42:40 +02:00
worktycho
468c2558d6
Removed isDone check
...
The same data is returned by executeStep so why execute a call when you have the data.
2014-08-31 21:26:02 +01:00
worktycho
361b7d5379
Changed null check to assert
...
Changed the null check to clarify that the function should not be called before the entity has been attached to a world.
2014-08-31 21:14:42 +01:00
Howaner
af125d2a61
Use std::auto_ptr
2014-08-31 22:04:52 +02:00
worktycho
3e7332c70c
Delete the entity before removing from the list
...
Old code was calling dereference on invalid iterator
2014-08-31 20:28:41 +01:00
worktycho
b6d77d9679
Init RankMgr pointer to NULL
2014-08-31 20:26:08 +01:00
Howaner
0d392f53ed
Fixed compile warnings.
2014-08-31 20:53:41 +02:00
Howaner
66417f7a48
Fixed wrong doxy-comment.
2014-08-31 19:29:54 +02:00
Howaner
3d7b8d3598
Rewrited furnace.txt
2014-08-31 19:28:36 +02:00
Howaner
0beed83ae9
Rewrited furnace.txt loading.
2014-08-31 19:00:36 +02:00
Masy98
90d39fd917
Added furnace recipes!
2014-08-31 16:50:05 +02:00
Masy98
ec259eeef0
Added missing mossy stonebrick recipe!
2014-08-31 16:33:19 +02:00
Masy98
b13f10aabf
Added 1.8 recipes!
2014-08-31 16:25:12 +02:00
Masy98
9ee5229833
Added 1.8 blocks and items!
2014-08-31 15:28:01 +02:00
Howaner
1ec8c12799
WebAdmin: Exported logo and background.
2014-08-31 15:25:40 +02:00
Howaner
e67bb7f431
WebAdmin: Stop webadmin if template can't load.
2014-08-31 15:03:23 +02:00
Howaner
ceb1a46449
WebAdmin: Added favicon to the login template.
2014-08-31 14:52:44 +02:00
Howaner
fca986ec71
WebAdmin: Exported favicon.
2014-08-31 14:51:07 +02:00
Howaner
9a95b00648
WebAdmin: Exported stylesheet in a own file.
2014-08-31 14:39:58 +02:00
Howaner
8934ab487e
WebAdmin: Added login template
2014-08-31 14:20:42 +02:00
Howaner
7e5f22141f
WebAdmin: Added "files" folder and load the login template from login_template.html
2014-08-31 12:59:04 +02:00
