Howaner
7bd414e9ed
Merge branch 'master' into Monster
2014-08-04 12:11:38 +02:00
Mattes D
7b986e65d2
Merge pull request #1285 from mc-server/StrCaseRefactor
...
Refactored case-conversion functions.
2014-08-04 12:02:57 +02:00
Mattes D
f619a9953a
Merge pull request #1283 from Howaner/GlobalFixes
...
Fixed skins in mc 1.7.9/1.7.10
2014-08-04 12:02:22 +02:00
madmaxoft
1fa210c7f9
Refactored case-conversion functions.
...
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
madmaxoft
054ce9bcc4
Anvil: Wolf owner not saved if not present.
2014-08-04 11:29:40 +02:00
Howaner
8cdcfcceb3
Changed properties for-loop.
2014-08-04 11:26:31 +02:00
Howaner
e70077361d
Changed /** to /*
2014-08-04 11:23:35 +02:00
madmaxoft
122344bb7a
Rewritten string case manipulation to use std::transform.
2014-08-04 08:00:49 +02:00
Howaner
7bea90d6ca
Fixed warnings
2014-08-04 01:35:25 +02:00
Howaner
0911072d27
Attempt to fix knockback and swimming.
2014-08-04 01:34:12 +02:00
Howaner
65720c8db1
Merge branch 'master' into GlobalFixes
2014-08-03 22:21:49 +02:00
madmaxoft
b19874e6f2
Attempting a compilation fix for gcc / clang.
2014-08-03 22:19:43 +02:00
Howaner
977a9948b9
Fixed skins in mc 1.7.9/1.7.10
2014-08-03 22:15:26 +02:00
madmaxoft
3136fc6246
Wolf uses UUID for owner.
...
Fixes #1277 .
2014-08-03 22:04:52 +02:00
madmaxoft
21f52676f3
cMojangAPI: Added UUID-to-Name lookup.
...
Also fixed the bindings, now all functions are static-like.
2014-08-03 22:04:51 +02:00
madmaxoft
98a13d97b3
Trailing whitespace fix.
2014-08-03 22:04:50 +02:00
madmaxoft
003f18bd0f
Added cMojangAPI:GetUUIDFromPlayerName().
...
This is a simpler way to ask for a single name -> uuid conversion.
2014-08-03 22:04:50 +02:00
madmaxoft
836de13797
Added cPlayer::GetUUID().
2014-08-03 22:04:48 +02:00
madmaxoft
6ce61d1a6f
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
STRWarrior
a24e960a89
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-08-03 15:32:45 +02:00
STRWarrior
dd9a19e395
VillageGen: Fixed a typo in comment
2014-08-03 15:31:59 +02:00
archshift
e461df0030
Entity.cpp: Air timer comment fix
2014-08-03 02:20:48 -07:00
archshift
9ecce2366e
Code reduction and clarity fixes
2014-08-02 22:35:29 -07:00
archshift
3ffec92e79
Removed unused cPlayer::FoodPoison function
2014-08-02 22:27:27 -07:00
archshift
7915c4ca7c
Entity.cpp: On portal check, use if-else for current dimension
...
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07:00
STRWarrior
a44fbf2338
Added proper trees and height for SwamplandM biome
2014-08-02 21:44:16 +02:00
Howaner
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
Tiger Wang
b5c0a4aa3a
Fixed issues with autocomplete and time loading
...
* Fixes #1274
2014-08-01 22:15:34 +01:00
Tiger Wang
c865fc8ca5
Improved endermen code a little
2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
Howaner
bfe11024ac
Added missing HOOK_BLOCK_SPREAD call.
2014-08-01 19:37:08 +02:00
Mattes D
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Mattes D
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner
86d84bcb73
Compile fix.
2014-08-01 17:29:17 +02:00
Howaner
160fa3a9a9
Import Statistics.h
2014-07-31 23:56:49 +02:00
Mattes D
a9317ac372
Merge pull request #1270 from Howaner/Options
...
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
2014-07-31 23:45:01 +02:00
Mattes D
bc1cfd5942
Merge pull request #1271 from Howaner/GlobalFixes
...
Fixed water from ice and removed packed ice drop.
2014-07-31 23:37:37 +02:00
Tiger Wang
1094d91fba
Merge pull request #1047 from mc-server/Enderman
...
Enderman attacks a player if he's looking at him
2014-07-31 22:20:05 +01:00
Howaner
09b63565bc
Use "default:" in switch.
2014-07-31 23:19:05 +02:00
madmaxoft
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
Howaner
cfaef0de38
Capitalised "incremental"
2014-07-31 23:11:51 +02:00
Howaner
87d195171a
Changed IsSolid to FullyOccupiesVoxel
2014-07-31 23:08:08 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
madmaxoft
70fd7caf1f
Removed trailing whitespace.
2014-07-31 22:54:45 +02:00
madmaxoft
ecb86935f8
Fixed UUIDs handling in cPlayer.
...
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
Tiger Wang
ffd6797fe1
Comment suggestions
2014-07-31 18:17:21 +01:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
Howaner
f47765dcbd
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.
2014-07-31 18:21:45 +02:00
Howaner
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
madmaxoft
59adf113f0
MojangAPI: Moved the settings to a separate ini section.
2014-07-31 17:22:48 +02:00
Howaner
c49d4fd215
Updated documentation.
2014-07-31 12:15:18 +02:00
Howaner
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
madmaxoft
8b519bf6e2
MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().
2014-07-31 10:02:50 +02:00
Howaner
e6ca5a5ece
Added window update.
2014-07-30 22:54:19 +02:00
Howaner
dcd226d904
Added beacon load/save.
2014-07-30 22:50:34 +02:00
STRWarrior
7821326370
Suggestions
2014-07-30 22:43:59 +02:00
Howaner
ad4fa6eba8
Changed return type from GetPrimaryPotion() and GetSecondaryPotion()
2014-07-30 22:22:06 +02:00
Howaner
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
Howaner
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
STRWarrior
6e0a8d393b
Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage
2014-07-30 21:56:33 +02:00
STRWarrior
f232ef5cd6
Fixed doxy comment
2014-07-30 21:50:02 +02:00
STRWarrior
fd2d338a25
Fixed comment at the end of a for-loop
2014-07-30 21:42:48 +02:00
STRWarrior
c4e6a14235
Added lighting code and added comments
2014-07-30 19:18:11 +02:00
madmaxoft
0336e12cee
MojangAPI: Renamed cache file to MojangAPI.sqlite.
2014-07-30 17:09:41 +02:00
STRWarrior
17b679f355
Fixed compiling using Clang
2014-07-30 17:09:00 +02:00
STRWarrior
5249f574bd
Added RoofedForest trees.
...
Could still be improved allot.
2014-07-30 15:55:50 +02:00
madmaxoft
85d64d291a
MojangAPI: Clarified the UUID conversion code.
2014-07-30 14:09:30 +02:00
madmaxoft
426773df17
ManualBindings: Fixed alignment.
2014-07-30 14:03:14 +02:00
STRWarrior
5daeba7e88
Removed lighting code in cEnderman::CheckEventSeePlayer
2014-07-30 13:59:47 +02:00
madmaxoft
17a94b16ea
MojangAPI: Implemented UUID shortening and dashing.
2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e
Exported cMojangAPI to Lua.
2014-07-30 13:56:29 +02:00
madmaxoft
4dd858f899
Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.
...
The cache is persisted into a SQLite DB file on server shutdown.
2014-07-30 13:56:29 +02:00
STRWarrior
75b7c37755
PreSimulator: Added configurations.
...
You can now choose if it should pregenerate something or not
2014-07-30 13:06:48 +02:00
madmaxoft
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
archshift
1d68469718
Fixed "Dependency" typos
2014-07-29 22:43:25 -07:00
Mattes D
b41c8b5de7
Merge pull request #1262 from mc-server/CanBeTerraformed
...
Added cBlockInfo::CanBeTerraformed and made finishers use it
2014-07-30 07:09:33 +02:00
madmaxoft
7022ae7988
Fixed FinishGen.h types.
2014-07-30 07:08:29 +02:00
archshift
487c572429
Entity.h: Moved constants out of some unnamed enum
2014-07-29 19:14:56 -07:00
Howaner
438e4088d6
Changed size_t to 'unsigned long'
2014-07-30 01:22:51 +02:00
Howaner
9a4d80fc3b
Fixed compile error with clang.
2014-07-30 00:45:03 +02:00
STRWarrior
931443ac67
Added soulsand to the terraformed list.
2014-07-29 22:40:40 +02:00
STRWarrior
adae2b70b1
Added cBlockInfo::CanBeTerraformed and made finishers use it
...
I might have forgotten some of them though
2014-07-29 22:31:31 +02:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Mattes D
30e64ed4d8
Merge pull request #1061 from mc-server/portals
...
Portals and others
2014-07-29 17:48:56 +02:00
Mattes D
d715eb7f5e
Merge pull request #1254 from mc-server/SingleTopBlockFinisher
...
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
2014-07-29 17:47:40 +02:00
Mattes D
8287f2d933
Merge pull request #1252 from mc-server/RoughRavinesGen
...
Rough ravines gen
2014-07-29 17:46:57 +02:00
Tiger Wang
cb77b39dc6
Detrailed whitespace
2014-07-29 16:36:24 +01:00
STRWarrior
4ccf14f3b3
Some finishing touches
...
Removed whitespace
fixed dead bush comment
2014-07-29 17:01:15 +02:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
STRWarrior
c8c01b055d
Fixed comment above cFinishGenSingleTopBlock
2014-07-29 15:24:11 +02:00
STRWarrior
57bb03148a
SingleTopBlock: All blocktypes and biometypes get initialized properly
2014-07-29 13:13:23 +02:00
madmaxoft
1acd03f96f
Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.
2014-07-28 17:09:39 +02:00
STRWarrior
e74984675c
Using suggestions
2014-07-28 16:53:01 +02:00
STRWarrior
579f850506
Forgot Mesa Plateau biome.
2014-07-28 14:28:16 +02:00
STRWarrior
bf1aa79932
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
...
Now accepts a vector of biomes and a vector of allowed blocks.
2014-07-28 14:23:29 +02:00
madmaxoft
f5f9656917
cAuthenticator: Added GetUUIDsFromPlayerNames().
2014-07-28 12:37:48 +02:00
STRWarrior
5b69b2ce4f
DistortedHeightmap: Now generates gravel in deep ocean.
2014-07-28 12:30:16 +02:00
madmaxoft
fd4ee20b2a
Hotfixed compilation problems.
2014-07-27 23:15:51 +02:00
Howaner
2bdc2701f4
Change Group->SetColor() again.
2014-07-27 21:58:00 +02:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00