Commit Graph

1150 Commits (51891b766c733220b5267be1b4bcf6f04717e976)

Author SHA1 Message Date
tonibm19 48b0f4daa4 Use cRoot:Get():GetServer():GetNumPlayers() instead of a custom function. 2014-12-30 10:31:16 +01:00
tonibm19 b621fb511f Added player count to webadmin
Now it shows the number of online players near the memory use
2014-12-29 20:21:57 +01:00
Mattes D f59740b262 APIDump: Added details about client handle in OnServerPing hook. 2014-12-25 00:36:01 +01:00
Mattes D 5609d76ed7 APIDump: Updated the player block placement documentation.
The hooks now have fewer parameters but are called on all player-placed blocks (#1618).
2014-12-24 20:02:51 +01:00
Masy98 6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98 5cfb6063c3 Fixed Guardians size and health 2014-12-19 16:06:43 +01:00
Masy98 706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98 c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Mattes D aff32ba27b Updated Core. 2014-12-16 12:52:34 +01:00
Masy98 5005c01f4c Fixed fence/-gates and door recipes and added baked potato recipe 2014-12-14 16:01:06 +01:00
Alexander Harkness 72b38c284f Merge pull request #1663 from mc-server/APIDumpSize
APIDump Width
2014-12-13 14:39:22 +00:00
STRWarrior 3fb10f064c Made comment in example code smaller
It caused the whole page to extend beyond the max width
2014-12-13 15:34:46 +01:00
STRWarrior 4f2931dd39 Reverted main_APIDump.lua changes 2014-12-13 15:33:51 +01:00
STRWarrior f62a0e137e Fixed the width sometimes going over the div size 2014-12-13 12:59:23 +01:00
Mattes D 125c70ab63 Updated the Core. 2014-12-12 14:33:11 +01:00
Mattes D 6cd7e52eb7 Exported cWorld:PrepareChunk to Lua API, test in Debuggers. 2014-12-12 13:32:52 +01:00
Mattes D 1142879cc8 Debuggers: Added loadchunk and preparechunk commands.
preparechunk is not working yet because the required API is missing.
2014-12-11 21:21:58 +01:00
Mattes D 2a4ad3a475 Debuggers: Changed to use Info.lua file. 2014-12-11 21:21:57 +01:00
Jonathan Fabian a1c6e89273 Fix duplicate commands added to README.md 2014-12-04 23:25:46 -05:00
Howaner 3bf9e978ae Updated core 2014-12-01 16:05:22 +01:00
Howaner e74ad386f0 Reverted bad .gitignore change 2014-12-01 16:04:49 +01:00
Howaner bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner 677dde51bd Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-12-01 14:43:03 +01:00
Mattes D 36500f88b2 Merge pull request #1624 from mc-server/LuaDeprecating
Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead
2014-12-01 09:50:34 +01:00
Howaner 6adf749164 Merge branch 'master' into MobSpawner 2014-11-30 19:38:52 +01:00
Mattes D c8384fee39 Merge pull request #1622 from M10360/master
Missing Fuels, Incorrect Smelting Recipe, Duplicate Code, Listing Myself
2014-11-29 22:00:06 +01:00
Howaner 615bca1567 Update core 2014-11-29 16:00:52 +01:00
Howaner ea20ccaa96 Removed old MobType category. 2014-11-29 15:45:12 +01:00
Howaner c673eb590f Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead 2014-11-29 15:40:38 +01:00
Howaner 2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
M10360 7f190c4ec2 Smelting Netherrack not TallGrass gives you NetherBrickItem. 2014-11-29 01:59:01 -06:00
M10360 23a176057d Added missing fuels. 2014-11-29 01:56:44 -06:00
M10360 ab9c006938 Removed duplicate. 2014-11-29 01:47:13 -06:00
Mattes D f0266c578e InfoReg: Added a diagnostic for bad Info.lua command info. 2014-11-22 13:31:58 +01:00
Mattes D 9ece37e8f1 Merge pull request #1598 from mc-server/SignEditor
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
Mattes D a63eb1ac6e Merge pull request #1577 from mc-server/ViewDistance
Added a MaxViewDistance option.
2014-11-16 15:13:39 +01:00
Howaner 277151582f Use LastPlacedSign instead of LastPlacedBlock. 2014-11-15 22:36:31 +01:00
Howaner fe9750136c Updated APIDump 2014-11-15 15:27:41 +01:00
Howaner 8c3c11d6b3 Renamed GetSettedViewDistance() to GetRequestedViewDistance() 2014-11-15 14:27:50 +01:00
Howaner 7120b1a769 APIDump: Fixed example cCompositeChat URL 2014-11-14 22:56:55 +01:00
Howaner 66c4117856 Updated APIDump 2014-11-14 22:55:09 +01:00
Mattes D 58fe37814b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-11-06 08:55:33 +01:00
Lukas Pioch 13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Alexander Harkness dc401e6ff4 Merge pull request #1587 from Ambushed91/WebAdmin
Update V1.0.3
2014-11-05 19:37:09 +00:00
Ambushed91 0fa8c881a6 Update V1.0.9
Removed Time, Scroll-Able Header, Resized contention
2014-11-05 14:20:03 +01:00
Ambushed91 eab829ee37 Update V1.0.3
WebAdmin Fixes
2014-11-05 13:45:15 +01:00
Mattes D 74aef9ea64 WebAdmin: Fixed login template destination address. 2014-11-04 15:22:53 +01:00
Mattes D dd75330d1e Merge remote-tracking branch 'ambushed/WebAdmin' 2014-11-04 14:54:00 +01:00
Arian 8604978d50 Update template.lua 2014-11-04 00:17:14 +01:00
Arian b98d0c51de Update template.lua
more to come
2014-10-28 22:12:57 +01:00
Arian c105e6fa03 Update login_template.html 2014-10-28 22:09:11 +01:00
Arian a9b152956e Update style.css 2014-10-28 21:51:42 +01:00
Arian a9f2f2e634 Update login.css 2014-10-28 21:41:56 +01:00
Arian 3f21c8bb24 Update login.css 2014-10-28 21:41:16 +01:00
Arian 9b93cb647d Update guest.html 2014-10-28 21:40:50 +01:00
Arian c0c1a9ceea Update template.lua 2014-10-28 00:08:29 +01:00
Arian 292d13ad9a Update login_template.html 2014-10-27 23:49:26 +01:00
Arian 22165559ea Update login.css 2014-10-27 23:48:02 +01:00
Arian 6d306b9c4e Update style.css 2014-10-27 23:46:46 +01:00
Arian 738905c84d Update template.lua
Added licence
2014-10-27 19:31:51 +01:00
Arian 7590d5facf Update login_template.html
Added licence
2014-10-27 19:31:25 +01:00
Arian 9c002dc0c8 Update style.css
Added licence
2014-10-27 19:31:06 +01:00
Arian 1aef54e793 Update login.css
Added licence
2014-10-27 19:30:37 +01:00
Ambushed91 d0a47d9273 Update template.lua 2014-10-27 19:13:25 +01:00
Ambushed91 bc1a98b2db Update template.lua
Removed FusionCare link, change position for "Current time JS", Compression Ratio: 31% (HTML)
2014-10-27 18:45:41 +01:00
Ambushed91 c9fd6f820a Update template.html
Removed all changes, back to old one
2014-10-27 18:36:32 +01:00
Ambushed91 3132059f1e Update login_template.html
Changed copyright, current time and removed google.fonts. Loadtime has been lowered by: Compression Ratio: 86%
2014-10-27 18:34:39 +01:00
Ambushed91 52a369dafa Update style.css
Removed 142 unused css code's, compressed with 27.72%
2014-10-27 17:57:30 +01:00
Ambushed91 35e1ea3b73 Update login.css
Css has been cleaned and compressed. Take 44 unused css code's and compressed 39.09%
2014-10-27 17:38:53 +01:00
Ambushed91 6e5111cd66 Update login.css
Buatified
2014-10-27 17:30:51 +01:00
Ambushed91 2be8387f2b Update temp.html 2014-10-27 11:07:04 +01:00
Ambushed91 df69574136 Update guest.html 2014-10-27 10:48:47 +01:00
Mattes D 2e8f2c5b3a APIDump: Added basic projectile documentation. 2014-10-25 21:27:27 +02:00
Ambushed91 21ee559b89 Update login.css 2014-10-23 23:26:29 +02:00
Mattes D f6ddafabd6 Re-updated Core. 2014-10-23 22:50:42 +02:00
Ambushed91 ba5ff77290 Update template.lua 2014-10-23 21:57:37 +02:00
Ambushed91 d605abced9 Update style.css 2014-10-23 21:44:38 +02:00
Ambushed91 86c433bd1c Update login.css 2014-10-23 21:44:13 +02:00
Ambushed91 0394208539 Update login_template.html 2014-10-23 21:41:25 +02:00
Ambushed91 0f6c56c6be Update temp.html 2014-10-23 21:03:53 +02:00
Ambushed91 951c5b99eb Update login_template.html 2014-10-23 21:03:19 +02:00
Ambushed91 1c58137ef0 Update (original).html 2014-10-23 21:02:02 +02:00
Ambushed91 811c10625a Update style.css 2014-10-23 20:59:00 +02:00
Ambushed91 8d941212ed Update guest.html 2014-10-23 20:55:49 +02:00
Ambushed91 c23d87277d Update WebAdmin
All files have been updated to the latest version off the new WebAdmin
look.
2014-10-23 19:59:49 +02:00
Howaner 72bb299a4a Merge branch 'master' into ChunkLoader
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
2014-10-23 14:59:42 +02:00
Alexander Harkness 782e466ca1 Upgraded core. 2014-10-22 15:27:01 +01:00
Mattes D bfd1a9601a APIDump: Added docs for a few projectiles. 2014-10-22 16:06:31 +02:00
Alexander Harkness 7cda6f9346 Clearer version indication. 2014-10-22 13:55:21 +01:00
Mattes D 1cd45e770d Added inheritance information to Lua docs for projectiles. 2014-10-21 23:11:45 +02:00
Howaner 5d3b6c212f Reverted plugin remove 2014-10-21 18:30:59 +02:00
Howaner 690e89001e Fixed submodule downgrades 2014-10-21 18:13:14 +02:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang bc97399b01 Updated ProtectionAreas 2014-10-21 13:44:33 +01:00
Mattes D ac80f62650 Updated the Core. 2014-10-20 20:23:38 +02:00
Mattes D d79d5945e3 InfoDump: Do not crash if one plugin fails to load.
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
2014-10-20 20:14:00 +02:00
Mattes D 5d43dc0f45 InfoDump: Fixed trailing whitespace. 2014-10-18 20:53:58 +02:00
Mattes D e2c1b86839 InfoDump: Fixed GH permission export, moved output to plugins. 2014-10-18 20:51:28 +02:00
Mattes D 7f8118e0cb cWorld: Fixed scheduler.
Fixes #1534.
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
archshift 20dfd9ba3e Webadmin: use images already in files/ instead of inline image data
This also probably means that the browser will be able to cache the images better, and not have to repeatedly download them al a part of the HTML.
2014-10-11 13:36:43 -07:00