1
0
Commit Graph

1234 Commits

Author SHA1 Message Date
Mattes D
8a715db41f Merge pull request #775 from worktycho/warnings
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813 Hexified colours 2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08 Fixed data length issues 2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66 Demonstrated issues with GetDataLength() 2014-03-09 12:48:58 +00:00
Tiger Wang
8f134adb6d Improved formatting of username tabcomplete 2014-03-09 12:48:55 +00:00
Tiger Wang
217aaca699 Moved firework handler to separate function
* Also simplified and improved readability of code
2014-03-09 12:48:53 +00:00
Tiger Wang
c05a1db88d CheckBlockInteractionsRate() fixed & enabled 2014-03-09 12:48:52 +00:00
Tiger Wang
e2cbebe522 Fix Linux compile 2014-03-09 12:48:49 +00:00
Tycho
4cb0b82d1d Fixed some warnings 2014-03-09 05:05:37 -07:00
Tycho
14c2f620d1 FIxed int in test 2014-03-09 04:43:22 -07:00
Jan-Fabian Humann
f74ee8fb51 Adjusted style of switch/case 2014-03-09 10:55:06 +01:00
Tiger Wang
ff186f9735 TNT explodes when consumed by fire
Fixed FS#406
2014-03-09 01:23:55 +00:00
Tiger Wang
8d2ebf8e19 Slight plugin messaging changes
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
2014-03-09 00:36:02 +00:00
Tycho
6b530bde75 Added static 2014-03-08 11:53:37 -08:00
Tycho
a6ed75c1fb Added tons more asserts to bytebuffer 2014-03-08 11:18:51 -08:00
Tycho
27fa2b72ba Enabled self test of bytebuffer 2014-03-08 11:05:37 -08:00
Jan-Fabian Humann
72f9c8b069 Changed if-else to switch-case 2014-03-08 19:26:32 +01:00
Mattes D
3a6499b192 Merge pull request #729 from worktycho/MetaRotate
Alternitive solution to #503
2014-03-08 18:27:24 +01:00
Jan-Fabian Humann
66970fe943 Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. 2014-03-08 17:55:53 +01:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Tycho
9b47366d03 Actually Fixed ByteBuffer 2014-03-08 07:36:52 -08:00
Tycho
c3758112cc Merge branch 'master' into warnings 2014-03-08 07:13:45 -08:00
worktycho
16ebbca35b Moved returns 2014-03-08 14:23:00 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
andrew
6679641b9e cBlockInfo-related changes from #723 2014-03-08 12:53:15 +02:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
Mattes D
ae84cdf242 Merge pull request #764 from xdot/master
Fixed water/lava interaction
2014-03-07 21:33:22 +01:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
worktycho
6b153a5014 Move env code part 1 2014-03-07 19:59:49 +00:00
Tycho
72697cfb4f Added support to overide CMake build type with env vars 2014-03-07 11:23:28 -08:00
Tycho
21e85b0745 Warnings 2014-03-07 11:15:04 -08:00
Tycho
d33d72f0dc Warnings 2014-03-07 11:04:25 -08:00
andrew
d86fc1af06 Added some comments 2014-03-07 20:49:40 +02:00
Tycho
7f389522ef Fixed warnings 2014-03-07 10:42:13 -08:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
fd4eda7d24 Fixed a typo. 2014-03-07 17:43:19 +01:00
Mattes D
c1977035cf Merge pull request #760 from Howaner/GlobalFixes
Add data backsending, when the Client interacts a Block and the Interact...
2014-03-07 14:45:45 +01:00
andrew
8808523942 Fixed water/lava interaction 2014-03-07 15:42:03 +02:00
Howaner
c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
madmaxoft
97d803e34f Added cBlockArea serialization to string.
Fixes #665.
2014-03-07 09:17:13 +01:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Howaner
1c7a580e52 Fix comment 2014-03-06 13:35:53 +01:00
madmaxoft
3e80e63665 Merge remote-tracking branch 'xdot/master' 2014-03-06 13:24:28 +01:00
Howaner
99b9e6dce5 Broadcast the Equipped Item, if the Slot is changed. 2014-03-06 11:08:47 +01:00
Howaner
594ddd86a0 Add SendBlockTo to cWorldInterface 2014-03-05 19:33:43 +01:00
Howaner
ee1ba3e0b0 Set tnt step sound to step.grass 2014-03-05 15:14:20 +01:00
Howaner
d4a5b16c52 Add data backsending, when the Client interacts a Block and the Interact is cancelled. 2014-03-05 15:10:20 +01:00
andrew
1ea17c0a75 Implemented vanilla-like fluid simulator 2014-03-05 15:54:38 +02:00
madmaxoft
a845c051b8 Fixed some gcc warnings in Defines.h. 2014-03-04 22:25:31 +01:00
madmaxoft
8f78288564 Manually exported cCompositeChat modifiers.
This adds chaining support to them. Fixes #755.
2014-03-04 22:17:23 +01:00
madmaxoft
ecfe17b096 cLuaState: Made public the GetStackValue() functions. 2014-03-04 21:55:24 +01:00
madmaxoft
e50ffba1ad Fixed an assert in map-loading.
The maps were loaded too soon, the world wasn't initialized yet.
2014-03-04 18:40:55 +01:00
madmaxoft
442c1d96fc Fixed previous weather changes.
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
2014-03-03 20:55:04 +01:00
Mattes D
71ae689eb7 Merge pull request #746 from Howaner/Slabs
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-03 20:52:08 +01:00
andrew
36fd78af35 Removed if condition 2014-03-02 22:55:14 +02:00
Tycho
a38be148ba Reformatted 2014-03-02 12:33:08 -08:00
Tycho
6536233f4d Reformated MetaRotater 2014-03-02 12:29:20 -08:00
Howaner
1d67345989 Add cancelling to WeatherChanging event. 2014-03-02 21:04:01 +01:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
madmaxoft
7fb354e8f0 Fixed MSVC warnings in DeprecatedBindings. 2014-03-02 16:34:16 +01:00
Howaner
5e427ee825 More documentation (thanks to madmaxoft) and use GetBlockTypeMeta 2014-03-02 16:16:22 +01:00
madmaxoft
274d2bcb17 Added blockface mirroring and rotating. 2014-03-02 16:14:00 +01:00
Mattes D
b17d04737d Merge pull request #738 from xdot/master
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
Howaner
e4b2502896 Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs 2014-03-02 16:01:37 +01:00
andrew
0c87341631 GetById => Get 2014-03-02 16:24:09 +02:00
tonibm19
10fdc51b0a Creeper fixes
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
2014-03-02 14:35:03 +01:00
worktycho
8990410f18 Reverted BlockVine 2014-03-02 12:02:29 +00:00
andrew
cff4ee11f1 Removed g_BlockXXX arrays 2014-03-02 11:30:20 +02:00
Mattes D
0f2d9bc35f Merge pull request #733 from Howaner/Slabs
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-03-02 10:22:40 +01:00
andrew
68b75f7b7a Manually exported g_Block tables 2014-03-02 11:12:29 +02:00
andrew
3ca56b39bc Exported cBlockInfo 2014-03-02 10:50:24 +02:00
madmaxoft
2998228e85 Added more documentation for FastNBT parser. 2014-03-02 08:22:27 +01:00
madmaxoft
2325a1a162 ChunkDesc warns about StructureGen's deprecation. 2014-03-01 20:59:41 +01:00
madmaxoft
2f85c9648b Unified StructureGens and FinisherGens.
Now they are all Finishers. Fixes #398.
2014-03-01 20:59:41 +01:00
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
Tycho
1e1d89fd20 Fixed errors 2014-03-01 10:17:55 -08:00
Tycho
5093b75ef1 Revesed typedef 2014-03-01 10:14:24 -08:00
Tycho
65edffd5b0 Implemented Rotations 2014-03-01 10:04:50 -08:00
Tycho
0d26e81ab5 Merge branch 'master' into MetaRotate 2014-03-01 09:48:44 -08:00
Tycho
0acfbdd912 Final implementation of MetaRotater 2014-03-01 09:47:27 -08:00
andrew
5c5502be9e Refactored global block property arrays 2014-03-01 17:04:17 +02:00
andrew
39c8e68ef0 Exported cScoreboard::ForEachTeam 2014-03-01 14:27:55 +02:00
andrew
692a84af31 Shortened enums 2014-03-01 14:20:29 +02:00
andrew
a28e5eca18 Exported cScoreboard::ForEachObjective 2014-03-01 14:03:16 +02:00
andrew
5c44945287 Exported and documented cScoreboard 2014-03-01 12:08:40 +02:00
madmaxoft
c18748648d Forgotten changes to cChunkInterface. 2014-03-01 02:54:46 +01:00
madmaxoft
aecbf77293 Removed cBlockHandler forward declaration from cChunkInterface.
Wasn't needed. Also reformatted the code.
2014-03-01 02:46:50 +01:00
madmaxoft
3991c04d47 Improved comments in float size check. 2014-03-01 02:43:35 +01:00
Howaner
0274db0e14 Use switch in GetStepSound 2014-02-28 22:32:10 +01:00
madmaxoft
1826461884 Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
madmaxoft
d97363a1b3 Documented the changes in cJukeboxEntity. 2014-02-28 15:41:46 +01:00
madmaxoft
35def963f0 Moved common cGroupManager code to a separate function.
This fixes my concerns in PR #709.
2014-02-28 15:31:20 +01:00
Howaner
27b98dec2b Merge branch 'master' into Slabs 2014-02-28 15:29:50 +01:00
Howaner
66c8425041 Fix Double Slabs, fix Slab Meta and add more things to burnable 2014-02-28 15:26:32 +01:00
Mattes D
6ad4b78a7b Merge pull request #709 from Howaner/GlobalFixes
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
madmaxoft
0aac17874c Better fix for the 32-bit float reading. 2014-02-28 08:31:35 +01:00
Tiger Wang
9ac9249aca Removed unneeded includes in Player.cpp 2014-02-27 21:49:10 +00:00