1
0
Commit Graph

2895 Commits

Author SHA1 Message Date
Tycho
bf0050e066 Added forgoten files 2014-08-10 19:44:49 +01:00
Tycho
806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
Howaner
42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +02:00
Howaner
938bf1df69 Changed comment. 2014-08-10 17:12:08 +02:00
Howaner
ae61156391 Fixed swing arm animation when you ate. 2014-08-10 17:08:22 +02:00
Howaner
f90078c09f Added IsDaylightCycleEnabled saving. 2014-08-10 16:48:20 +02:00
Howaner
cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner
546dfaad3e Merge branch 'master' into LuaAPI 2014-08-10 16:35:07 +02:00
STRWarrior
e529401dbb Added NaturalPatches generator
It generates gravel and dirt.
2014-08-10 11:57:05 +02:00
STRWarrior
0ac3c67a21 Added NetherOreNests.
It generates Nether Quarts.
2014-08-10 11:48:05 +02:00
STRWarrior
ecfae28606 Changed cStructGenOreNests to take a list of ores + the block to replace. 2014-08-10 11:40:33 +02:00
STRWarrior
5eb5411f1e Removed an old and outdated comment. 2014-08-10 11:06:04 +02:00
madmaxoft
b0dedb0197 WebAdmin: Manually exported string conversion functions.
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:56:15 +02:00
madmaxoft
dcef688ccc WebAdmin: Added GetURLEncodedString(). 2014-08-09 22:56:06 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner
ebfc0fdc67 Added comment. 2014-08-08 22:04:53 +02:00
Howaner
3d68466ab0 Send the old slab to the client when the interact cancelled. 2014-08-08 18:55:05 +02:00
Mattes D
27a818e173 Merge pull request #1295 from mc-server/crystal
On destroy ender crystal, create bedrock and fire.
2014-08-07 09:20:34 +02:00
Howaner
a73c85d7eb Fixed nether wart digging.
Fixes #1265
2014-08-07 02:42:42 +02:00
Howaner
0c622522ea Removed debug message. 2014-08-07 01:08:31 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
archshift
beab61bbfe On destroy ender crystal, create bedrock and fire 2014-08-06 14:16:36 -07:00
Mattes D
eae42d91f9 Merge pull request #1291 from mc-server/RedstoneCleanUp
Redstone clean up
2014-08-06 17:14:39 +02:00
Tycho
6acddd0cad Fixed style issues 2014-08-06 13:19:22 +01:00
Tycho
a0ba7426c6 Fixed multiple inhertance being output by tolua 2014-08-06 13:17:05 +01:00
Howaner
ff7171fc5a Resending fire to the client when the interact cancelled. 2014-08-06 14:04:25 +02:00
Tycho
9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho
06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
Howaner
5f04488a97 Made lua clamp() compatible with all number types. 2014-08-05 18:39:18 +02:00
Howaner
43de9af878 Added api documentation for Clamp() 2014-08-05 13:54:04 +02:00
Howaner
a92cff20ea Added Clamp() function to the lua api. 2014-08-05 13:47:10 +02:00
archshift
d2d0ffee21 Fixed unsigned long comparison to size_t 2014-08-04 19:43:33 -07:00
madmaxoft
9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Franz Reiter
e2c4fbd4e2 Merge pull request #1287 from Howaner/Bow
Added arrow consuming on shooting
2014-08-04 22:30:58 +02:00
Howaner
2e43eaaba7 Changed arrow comment. 2014-08-04 22:30:13 +02:00
Tiger Wang
a032594bf7 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-04 21:24:31 +01:00
Tiger Wang
0b9eb20b92 Fixed signs not staying on other signs 2014-08-04 21:22:08 +01:00
Tiger Wang
de9d908792 Made AllToLua output consistent 2014-08-04 21:21:35 +01:00
Howaner
434ea542e1 Added arrow consuming on shooting 2014-08-04 21:48:33 +02:00
Howaner
f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
madmaxoft
7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02:00
madmaxoft
ff37192e94 BasicStyleCheck: Dividers are exactly 80 slashes. 2014-08-04 13:20:28 +02:00
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