flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,696 Commits 1 Branch 0 Tags 92 MiB
81c0116cf1
Commit Graph

241 Commits

Author SHA1 Message Date
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
nesco
b70e09bc90 Update World.h 2014-09-17 17:32:37 +02:00
nesco
f246faec16 Preparing 1.8 update 
Added Spectator gamemode
 2014-09-16 20:05:55 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol 
Conflicts:
	src/Items/ItemHoe.h
 2014-09-13 01:21:43 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02:00
Tycho
0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server 
THis wil hopefully allow for unit testing
 2014-09-11 17:48:21 +01:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue. 
This fixes #1370.
 2014-09-05 22:16:48 +02:00
madmaxoft
3297a39c27 Merge remote-tracking branch 'origin/master' into EntitiesInBox 2014-09-04 14:02:18 +02:00
madmaxoft
a51c1e0b73 Added cWorld::ForEachEntityInBox() 2014-09-03 17:00:26 +02:00
LO1ZB
75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
madmaxoft
008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Howaner
cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +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
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
c0b62ef139 Added a queue for setting chunk data. 
Fixes #1196.
 2014-07-24 18:32:05 +02:00
archshift
9045246e74 Export BroadcastEntityAnimation with ToLua 
Fixes #752
 2014-07-22 13:02:28 -07:00
Tiger Wang
a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01: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
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang
6ab9afd0fd Bug and crash fixes 
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
 2014-07-20 10:46:45 +01:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01: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
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
madmaxoft
7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01: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
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking. 
Fixes #1160.
 2014-07-10 18:18:32 +02:00
Tiger Wang
74b6b398e7 Fixed arrow collection animation 
* Fixed piston extension non-solidness
 2014-07-09 19:56:50 +01: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
Tiger Wang
19caba5125 Redstone simulator is alerted to lever unpowering 
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
 2014-07-02 18:46:00 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting. 
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
 2014-06-27 20:56:44 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
Tiger Wang
6e681269d9 Fixed invalid iterators 2014-06-21 22:07:38 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
Tiger Wang
a70b8298b6 Cauldrons check the heightmap 2014-06-14 10:14:04 +01:00
Tiger Wang
7188a1f670 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/World.h
 2014-06-14 09:57:07 +01:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
Tiger Wang
e24830f0b1 Compile fix 2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e Reduced code duplication 
call @maxmaxoft!
calling...
call connected (0:20)
call ended
 2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74 IsWeatherSunnyAt does something useful :D 2014-06-11 13:37:04 +01:00
Alexander Harkness
c09207cabc SMICOLOSL 
Meant to be semicolons up there.
 2014-06-11 13:20:31 +01:00
Tiger Wang
711113cd2b Updated unnecessary function :/ 2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1 Add DoxyComments to he weather things. 
Also changed the function names.
 2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67 Add new IsWeatherWet hook for cauldrons. 
@madmaxoft can you comment?
 2014-06-11 10:33:16 +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
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
Tiger Wang
ccbf6cc446 Configurable portals 2014-06-04 20:00:55 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
cea3a8e7e8 Cauldrons fill 2014-05-29 16:58:40 +01:00
Tiger Wang
365c6f50bd Changed block send queue to use vectors 
As suggested by @worktycho.
 2014-05-29 11:57:06 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues 
* Fixes #879
* Fixes #714
 2014-05-25 13:46:34 +01:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes 
Conflicts:
	src/Vector3.h
 2014-05-06 20:15:19 +01:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
Tiger Wang
bbc5faa723 Redstone simulator now directly accesses cChunk 
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
 2014-04-27 17:35:41 +01:00
archshift
2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes 
Conflicts:
	src/World.h
 2014-04-24 18:57:25 +01:00
Tiger Wang
f763242e5c Small changes 2014-04-23 21:06:07 +01:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tycho
23395a5ce1 Merge branch 'master' into override 
Conflicts:
	lib/tolua++/CMakeLists.txt
 2014-04-05 14:12:17 -07:00
madmaxoft
a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
Tycho
5653997bcc Added override specifier to functions declared in cWorld 2014-03-22 08:43:54 -07:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft
260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds 
Beds now work properly, fixes #707
 2014-03-16 21:47:34 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt 
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d Shrapnel now configurable 2014-03-10 18:35:02 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00