1
0
Fork 0
Commit Graph

214 Commits

Author SHA1 Message Date
Lukas Pioch 41bfb22834 Corrected brewingstand and added support for fuel 2017-05-08 06:30:54 +02:00
mathiascode dae2adde65 Updated sounds and effect IDs (#3422) 2017-02-15 06:05:24 +01:00
Mattes D cbff1378fd Fixed bindings for cBlockArea:Read and Write. (#3568)
The original bindings accepted nil as the World param, causing a crash.
2017-02-05 16:00:38 +01:00
Mattes D 0bffa29358 Removed ClientHandle.h dependencies from common headers. 2016-11-18 20:00:04 +01:00
bibo38 cb640ffea4 Spectators added (#2852) 2016-10-12 14:38:45 +02:00
Mattes D d2e8643607 Fixed type-casting-related warnings. 2016-08-24 22:26:53 +02:00
Mattes D 8eaa8613da CMake: Remove needless minimum version specifications. 2016-07-18 22:11:42 +02:00
Mattes D f8e1df2476 Updated API documentation. 2016-07-18 22:11:40 +02:00
Mattes D fb4c3fc4d9 Changed cLuaWindow callbacks to use cLuaState::cCallback. 2016-06-27 20:51:50 +02:00
Mattes D e3d34d9917 Revert "Lua callback" 2016-03-21 09:58:15 +01:00
Mattes D af200dfaae Changed cLuaWindow callbacks to use cLuaState::cCallback. 2016-03-17 19:29:03 +01:00
LogicParrot ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
Mathias 89f3dec7ac Updated old forum links 2016-01-31 02:25:03 +02:00
Mattes D 80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed.
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
Tiger Wang 5b62c4c314 Reorganised the redstone simulator
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
2015-12-18 13:17:38 +00:00
Lukas Pioch d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Dave Tucker 83870f9fc0 Add enum for Sound and Particle Effects
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
Lukas Pioch 9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Mattes D 97beb2a350 Fixed custom recipes result clientside bug.
Fixes #2345.
2015-07-26 13:30:25 +02:00
tycho b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho e19693e529 Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Inventory.cpp
2015-05-28 11:05:41 +01:00
Alexander Harkness da4a76bb50 Merge pull request #2061 from mc-server/fixes
Fixes
2015-05-27 12:21:17 +01:00
Tiger Wang 10c9e66aad Fixes #2041 2015-05-24 13:37:36 +01:00
tycho dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
tycho 81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho 77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
Tiger Wang 1632d5f8f1 Fixes #2003 2015-05-18 15:43:24 +01:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Mattes D e08e932e7a Narrowed WindowID to use only 7 bits.
Ref.: http://forum.mc-server.org/showthread.php?tid=1876
2015-04-21 23:29:50 +02:00
Mattes D cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Howaner 685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Howaner 7528230596 Readded old comment 2015-02-06 21:54:47 +01:00
Howaner 1f94c318c5 Readded old DistributeStackToAreas() comment. 2015-01-25 00:40:59 +01:00
Howaner 8277e1ec4e C++11 and function rename. 2014-12-17 19:14:01 +01:00
Howaner 8591935a4b Implemented vanilla-like shift click.
This fixes many visual bugs.
2014-12-13 18:49:11 +01:00
Howaner b6fd400276 Own classes for all windows. 2014-12-13 15:06:55 +01:00
Tiger Wang 3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D 44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang 5089f04cf6 Replace &*[0] accesses with .data() 2014-10-21 13:20:06 +01:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Mattes D eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Tiger Wang b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Tiger Wang 7ce09a9113 Suggestions 2014-09-27 19:19:28 +01:00
Tiger Wang d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts
Conflicts:
	src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
Tiger Wang bc37b895bc e.t.c. -> etc.
etcetera, not egg tray conglomerate :P
2014-09-13 11:15:16 +01:00
Tiger Wang a8c7dadfd7 Added newlines 2014-09-13 11:14:17 +01:00
Tiger Wang 3e74113427 Implemented Chest Minecarts 2014-09-12 23:18:02 +01:00
Howaner c7044fa1dd 1.8: Fixed inventory open packet. 2014-09-11 23:17:27 +02:00
Hownaer c0c4ac5236 Added comments. 2014-08-28 15:21:50 +02:00
Hownaer 6c3b80f04c Fixed crashes and use std::swap. 2014-08-28 14:58:03 +02:00
Hownaer 0f1fd33123 Enchanting table improvements. 2014-08-28 01:21:54 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
Howaner 6e2025d125 Change comment. 2014-07-26 13:29:25 +02:00
Howaner ef4d68adfd Merge branch 'master' into Inventory 2014-07-26 13:27:27 +02:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Howaner 897d68dc35 Add armor items directly to the armor slots. 2014-07-20 01:22:58 +02:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 5890d04f21 UI/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang 37140ae578 Merge branch 'master' into portals
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
2014-07-18 20:10:51 +01:00
Howaner e32b0ce4fa Moved comment. 2014-07-18 16:38:59 +02:00
Howaner 2e9aed793a Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary. 2014-07-18 01:16:49 +02:00
madmaxoft c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
Tiger Wang e71e432633 Suggestions and bug fix
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
Mattes D ea24a4f4aa Merge pull request #1157 from Howaner/Window
Add more inventory actions.
2014-07-09 23:27:02 +02:00
Howaner 0d88e71d18 Removed unused include line. 2014-07-09 14:35:01 +02:00
Howaner 3615bf825b Added inventory number click. 2014-07-09 14:30:06 +02:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Mattes D 562d14e8ec Fixed crafting grid updating.
Fixes #1152.
2014-07-06 14:42:28 +02:00
Howaner 9d7a59012c Added drop window action. 2014-07-06 00:40:59 +02:00
Howaner 7a78f23b4a Add middle click. 2014-07-05 14:00:04 +02:00
Mattes D 39fff19955 Merge pull request #1138 from mc-server/enderchest
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
Howaner 64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner 64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Tiger Wang 909e0ed95b Removed bad comment 2014-06-29 11:41:50 +01:00
Tiger Wang dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Tiger Wang bfa8aaf41b Merge branch 'master' into portals
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Tiger Wang 74cd4f5521 Suggestions 2014-06-04 18:59:56 +01:00
Mattes D c11488ccd7 Merge pull request #1011 from SphinxC0re/SomeWarningFixes
Fixed some warnings
2014-06-04 18:02:45 +02:00
worktycho c94d0c8144 derp 2014-06-04 11:39:21 +01:00
worktycho 98c575ebc2 Make sure m_StackSizeToBeUsedInRepair Always has a valid value 2014-06-04 11:12:06 +01:00
Howaner 12f3c0fcdf Players can't set items in the result slot, when they shift a item. 2014-06-01 00:50:35 +02:00
Howaner a18b6c2311 Add HandleSmeltItem() call for achievements. 2014-06-01 00:43:09 +02:00
Howaner 5368e66486 Missing return; 2014-06-01 00:29:17 +02:00
Howaner 2030800ad7 Set DraggingItem to Slot directly. 2014-05-31 00:27:24 +02:00
Howaner d422aa4081 Fix DBL bug. 2014-05-31 00:25:20 +02:00