STRWarrior
|
132a92226b
|
Merge branch 'master' into DungeonLoot
Conflicts:
src/ItemGrid.cpp
|
2014-10-16 11:43:59 +02:00 |
|
STRWarrior
|
07b5ce0c54
|
Changed i variable to j
The server wasn't going over all the items before.
|
2014-10-16 11:17:39 +02:00 |
|
Mattes D
|
799ae87d3f
|
BioGen: Fixed a compiler warning.
|
2014-10-16 11:00:30 +02:00 |
|
STRWarrior
|
5ed6d280ce
|
Reversed wrong fix for #1517.
|
2014-10-16 10:26:17 +02:00 |
|
Mattes D
|
fdd20e2a99
|
Merge pull request #1537 from mc-server/GenerationCrash
Fixed possible crash
|
2014-10-16 10:17:57 +02:00 |
|
STRWarrior
|
3f0d4fe250
|
Reversed the order of the loot
For some reason the rare items weren't generating at all.
Added forgotten Golden Apple
|
2014-10-15 22:10:14 +02:00 |
|
STRWarrior
|
08676128b0
|
Added loot to dungeons.
|
2014-10-15 21:15:12 +02:00 |
|
STRWarrior
|
0bdd2768ff
|
Fixed possible crash
It could crash if MinAmount - MaxAmount was 0 because it would execute (Number % 0)
|
2014-10-15 19:46:43 +02:00 |
|
Mattes D
|
06b466471f
|
Merge pull request #1536 from mc-server/MineshaftBooks
Mineshaft books
|
2014-10-15 19:23:53 +02:00 |
|
Mattes D
|
f58d44ea50
|
cLuaState::Call() uses variadic templates.
(doesn't compile)
|
2014-10-15 19:18:23 +02:00 |
|
Mattes D
|
eeb580a74e
|
Functions in cPluginManager get references instead of pointers.
|
2014-10-15 19:09:09 +02:00 |
|
STRWarrior
|
4038e1cb42
|
Using C++11 loops
|
2014-10-15 18:11:28 +02:00 |
|
STRWarrior
|
fa6f8fb38e
|
The code now prevents conflicting enchantments.
|
2014-10-15 15:44:52 +02:00 |
|
STRWarrior
|
0cdd2b64ed
|
IntNoise1DInt result gets devided by 7 first
suggestion by xoft
|
2014-10-15 15:42:45 +02:00 |
|
STRWarrior
|
57f8d2a55e
|
Adding enchantments directly instead of first getting the name of it.
|
2014-10-15 15:31:06 +02:00 |
|
STRWarrior
|
e4ee71868e
|
Renamed the counter to 'j'
|
2014-10-15 15:25:48 +02:00 |
|
STRWarrior
|
ff5f57514e
|
Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before
Added cEnchantment:GenerateEnchantmentFromVector that allows to get the same enchantments over and over.
|
2014-10-15 14:44:07 +02:00 |
|
STRWarrior
|
e3aa6e4857
|
Enchanted books generate in MineShafts chests
|
2014-10-15 14:08:45 +02:00 |
|
Mattes D
|
c6725f8d28
|
Usernames are lowercased before generating offline UUID.
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
|
2014-10-15 13:41:23 +02:00 |
|
Mattes D
|
7f8118e0cb
|
cWorld: Fixed scheduler.
Fixes #1534.
Added a test case into the Debuggers plugin.
|
2014-10-13 14:49:18 +02:00 |
|
Mattes D
|
1eae7d0ece
|
Fixed style.
|
2014-10-13 10:34:33 +02:00 |
|
Mattes D
|
120b347fb5
|
CheckBasicStyle ignores the Bindings.h generated file.
|
2014-10-13 10:33:08 +02:00 |
|
Mattes D
|
53410a9271
|
Merge pull request #1529 from mc-server/unique_ptr
Moved a few objects to unique_ptr
|
2014-10-12 22:08:28 +02:00 |
|
archshift
|
5c58d770dc
|
We only use VS2013 now, thus VS2008 is banished!
|
2014-10-12 11:48:19 -07:00 |
|
archshift
|
0478147ad7
|
Added CLion project directory to .gitignore
|
2014-10-12 11:42:53 -07:00 |
|
worktycho
|
fff9e50109
|
Aligned simulators
|
2014-10-12 12:44:59 +01:00 |
|
worktycho
|
daadde2077
|
Fix style
|
2014-10-12 12:18:52 +01:00 |
|
worktycho
|
6a448be88c
|
Fix spaces
|
2014-10-12 12:17:29 +01:00 |
|
worktycho
|
8dfeb6e324
|
Update World.cpp
|
2014-10-12 12:15:52 +01:00 |
|
Steven Riehl
|
4a25760363
|
fix std:min call, include algorithm and compare same type
|
2014-10-11 21:36:40 -06:00 |
|
Steven Riehl
|
dfd4e15ecb
|
refactor an if block to std::min
|
2014-10-11 21:18:57 -06:00 |
|
Steven Riehl
|
856764dee8
|
convert old style casts to fix warnings
|
2014-10-11 20:39:55 -06:00 |
|
Alexander Harkness
|
b4170e3184
|
Update README.md
|
2014-10-11 21:54:24 +01:00 |
|
Alexander Harkness
|
f7a0ab37c6
|
The longer URL has https, so we have to use that until the shortener has HTTPS.
|
2014-10-11 21:53:01 +01:00 |
|
Alexander Harkness
|
2d9179f4ab
|
Merge branch 'master' of github.com:mc-server/MCServer
|
2014-10-11 21:41:04 +01:00 |
|
Alexander Harkness
|
f42d520ccf
|
Added a guide to the easy install method.
|
2014-10-11 21:40:32 +01:00 |
|
archshift
|
20dfd9ba3e
|
Webadmin: use images already in files/ instead of inline image data
This also probably means that the browser will be able to cache the images better, and not have to repeatedly download them al a part of the HTML.
|
2014-10-11 13:36:43 -07:00 |
|
Alexander Harkness
|
b19742fe5a
|
Added easy installation method for Linux.
|
2014-10-11 21:31:49 +01:00 |
|
Mattes D
|
2bfe7b76a1
|
Merge pull request #1261 from mc-server/issue850
Continuation of #966: Adding E_METAs
|
2014-10-11 22:08:37 +02:00 |
|
Alexander Harkness
|
6af9d5ba01
|
Fixed compilation.
|
2014-10-11 18:39:46 +01:00 |
|
Alexander Harkness
|
93833069a8
|
Merge branch 'master' into issue850
Conflicts:
src/BlockID.h
|
2014-10-11 18:32:21 +01:00 |
|
Alexander Harkness
|
99efaa5a3c
|
More README changes.
|
2014-10-11 17:19:08 +01:00 |
|
Alexander Harkness
|
ae0705a67d
|
Fixes.
|
2014-10-11 17:17:22 +01:00 |
|
Alexander Harkness
|
d9a50dd2ee
|
Fixed remaining indent and replaced tiger with webfreak.
|
2014-10-11 17:15:38 +01:00 |
|
Alexander Harkness
|
2f66e986bd
|
Merge pull request #1531 from win32re/patch-1
More template changes.
|
2014-10-11 17:13:21 +01:00 |
|
win32re
|
0c4894b99e
|
Update template.html
|
2014-10-11 18:11:56 +02:00 |
|
win32re
|
59efc7cfd2
|
Fixed indentation.
|
2014-10-11 18:07:10 +02:00 |
|
Alexander Harkness
|
faa8e721d5
|
Reverted submodule changes.
|
2014-10-11 17:03:30 +01:00 |
|
Alexander Harkness
|
68762747e0
|
Fixed typo and removed useless right side up slab meta.
|
2014-10-11 16:59:13 +01:00 |
|
win32re
|
9bb2b43e9e
|
More template changes.
|
2014-10-11 17:57:56 +02:00 |
|