1
0
Commit Graph

7407 Commits

Author SHA1 Message Date
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
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
Alexander Harkness
af67a0033a Merge pull request #1528 from kjanku1/master
Android strings translated to polish
2014-10-11 16:48:31 +01:00
Alexander Harkness
d1a5abec89 Merge pull request #1530 from win32re/patch-1
Update template.html
2014-10-11 16:42:59 +01:00
win32re
d3f31b5046 Update template.html 2014-10-11 17:40:33 +02:00
Kamil Janku
040be609ff Update strings.xml 2014-10-11 16:14:20 +02:00
worktycho
1a07dc897d Fix lambda capture 2014-10-11 14:43:06 +01:00
kjanku1
a36f18fb49 Android strings transladed to polish 2014-10-11 14:22:55 +02:00
tycho
473c0425d3 Moved a few objects to unique_ptr 2014-10-10 15:33:19 +01:00
Mattes D
a47d9e5334 Fixed MSVC compilation. 2014-10-10 09:58:54 +02:00
archshift
ae5d311609 Merge pull request #1376 from mc-server/static_cast
Use static casts instead of C casts, add floor-cast functions
2014-10-09 15:12:51 -07:00
archshift
76b37acb42 Float/Ciel: If it's going to use C++11, it might as well take advantage of it 2014-10-09 14:57:57 -07:00
archshift
f8d1e96ae7 Use static casts instead of C casts, add floor-cast functions 2014-10-09 14:57:40 -07:00
Mattes D
f91aa6f1d3 DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
2014-10-09 12:33:42 +02:00
Mattes D
386068a5ad Merge pull request #1520 from mc-server/c++11switch
Enabled C++11 in gcc
2014-10-09 12:02:58 +02:00
worktycho
c3479f7557 Fix flag name in gcc 4.6 and earlier 2014-10-09 10:07:58 +01:00
worktycho
5cf1ba092e Enabled C++11 in gcc 2014-10-09 09:53:16 +01:00
Mattes D
b77d721daa Merge pull request #1519 from mc-server/submodulize
Submodulize some more plugins.
2014-10-08 22:29:58 +02:00
Mattes D
30292c8112 Merge pull request #1518 from mc-server/AcaciaTrees
Added AcaciaTrees for the savanna biomes
2014-10-08 22:29:03 +02:00
Alexander Harkness
01f7ff303d Reordered .gitmodules. Fixes #496 2014-10-08 21:14:02 +01:00
Alexander Harkness
fa00cbeda3 Added MagicCarpet 2014-10-08 21:13:38 +01:00
Alexander Harkness
27e69f32c6 Removed MagicCarpet 2014-10-08 21:13:10 +01:00
Alexander Harkness
ccbd5ba6a2 Added Handy. 2014-10-08 21:11:09 +01:00