1
0
Commit Graph

177 Commits

Author SHA1 Message Date
madmaxoft@gmail.com
251c961eea Source files cleanup: Protocol-related files in a separate subfolder
git-svn-id: http://mc-server.googlecode.com/svn/trunk@880 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-23 20:03:26 +00:00
madmaxoft@gmail.com
f58c3f2e81 Source files cleanup: UI files renamed
git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-23 17:19:34 +00:00
madmaxoft@gmail.com
a5113218d2 Restored resource files from vc2010 into vc2008
git-svn-id: http://mc-server.googlecode.com/svn/trunk@872 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-22 08:30:19 +00:00
madmaxoft@gmail.com
bc466f07a4 Refactored windows.
As described on the forum: http://forum.mc-server.org/showthread.php?tid=561
For now, only basic clicking works; shift-click not implemented yet.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@867 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-20 13:25:54 +00:00
madmaxoft@gmail.com
9eed83c33a Merged in a patch for sounds by l0udPL
http://forum.mc-server.org/showthread.php?tid=434&pid=4564#pid4564

git-svn-id: http://mc-server.googlecode.com/svn/trunk@858 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-11 12:01:34 +00:00
madmaxoft@gmail.com
81e7eca286 Fixed profiling to work under the new project layout
git-svn-id: http://mc-server.googlecode.com/svn/trunk@844 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-07 16:40:05 +00:00
madmaxoft@gmail.com
49f6828834 Removed OS dependencies from CryptoPP; Removed unused modules that didn't compile on some platforms
git-svn-id: http://mc-server.googlecode.com/svn/trunk@827 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-04 10:17:27 +00:00
madmaxoft@gmail.com
539364846a Implemented 1.3.2 protocol encryption using CryptoPP, up to Client Status packet (http://wiki.vg/Protocol_FAQ step 14)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@808 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 21:06:13 +00:00
madmaxoft@gmail.com
f5fe723b2a Added a basic protocol recognizer and the base for 1.3.2 protocol.
Also fixed a few type-related warnings.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@805 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-30 09:56:59 +00:00
madmaxoft@gmail.com
f1d62b77cd Gotten completely rid of all cPackets. The cProtocol125 class now does all the parsing and writing by itself.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@802 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-29 21:02:39 +00:00
madmaxoft@gmail.com
1651fcd980 Moved all packet-serializing code into cProtocol125; half the packet classes aren't needed anymore.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@800 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-28 21:59:49 +00:00
madmaxoft@gmail.com
66f4c9e0c0 Cut out all packet handling to a separate cProtocol descendant
git-svn-id: http://mc-server.googlecode.com/svn/trunk@796 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-27 17:31:16 +00:00
madmaxoft@gmail.com
d97ad781b4 git-svn-id: http://mc-server.googlecode.com/svn/trunk@795 0a769ca7-a7f5-676a-18bf-c427514a06d6 2012-08-26 21:01:07 +00:00
madmaxoft@gmail.com
6ad8553a3a Added basic noteblocks, finished sign storage in Anvil (patch contributed by l0udPL)
http://forum.mc-server.org/showthread.php?tid=528

git-svn-id: http://mc-server.googlecode.com/svn/trunk@793 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-26 17:50:42 +00:00
faketruth
7c84349990 WebAdmin should not cause crashes anymore
Got rid of cWebPlugin_Lua
cPlugin_Lua is also a cWebPlugin now, so plugins don't need a separate cWebPlugin object
Changed some stuff to use AString instead of char*

git-svn-id: http://mc-server.googlecode.com/svn/trunk@777 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-22 14:22:21 +00:00
faketruth
12906c026d Moved files used by MCServer to a special MCServer folder
git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-20 12:20:20 +00:00
madmaxoft@gmail.com
2cae4b24d8 Added Core files to the VC2008 project (so that they can be opened from the IDE there, nothing more)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@749 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 09:52:11 +00:00
madmaxoft@gmail.com
cd7ead5f6a VC2008: Removed Android-specific files from all Windows build configurations
git-svn-id: http://mc-server.googlecode.com/svn/trunk@748 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 09:50:10 +00:00
faketruth
c40af4c4ab Android: Pressing back button sends stop command to server
Android: ToJava can call functions on Java by using JNI
Android: Plugins work
Android: Added android specific files to VS2008 project, but they are excluded from compiling

git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 22:20:35 +00:00
madmaxoft@gmail.com
70a4ca5bc1 Packets now parse themselves from a cByteBuffer object (1st part of packeting rewrite, http://forum.mc-server.org/showthread.php?tid=524 )
git-svn-id: http://mc-server.googlecode.com/svn/trunk@744 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 10:18:07 +00:00
madmaxoft@gmail.com
0e7bef4452 Fixed warnings in md5
git-svn-id: http://mc-server.googlecode.com/svn/trunk@703 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-29 12:03:04 +00:00
madmaxoft@gmail.com
5439d0c482 Fixed MSVC project for Squirrel lib, no more linker warnings about vc90.pdb
git-svn-id: http://mc-server.googlecode.com/svn/trunk@702 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-29 11:59:11 +00:00
madmaxoft@gmail.com
cd3cac71a0 VC2008 project: finally a truly Release build, with full optimization.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@700 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-28 12:21:11 +00:00
madmaxoft@gmail.com
3f30d5dfd2 Added a new cave generator: DualRidgeCaves ( somewhat like http://www.gamedev.net/blog/33/entry-2227887-more-on-minecraft-type-world-gen/ )
git-svn-id: http://mc-server.googlecode.com/svn/trunk@694 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-22 18:51:38 +00:00
madmaxoft@gmail.com
f2181420d7 Added a Release Profiled configuration to Squirrel MSVC2008 project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@686 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-21 14:13:14 +00:00
madmaxoft@gmail.com
7198ddba46 Ravines: initial implementation, randomized shapes are working, but still needs some work
git-svn-id: http://mc-server.googlecode.com/svn/trunk@683 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-19 21:49:27 +00:00
lapayo94@gmail.com
86a991c5a8 Some code improvements
git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-16 19:20:37 +00:00
lapayo94@gmail.com
14dce23845 A new Block handling system :o
It was really a lot of work :D
Took me the complete weekend :D

Would really like to here your opinion on this =)
The aim of this is to put all the actions for one block in one place so it is not spread around the source. (ToPickup, Action in cWorld, Action in cChunk, Action here, action there :D)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@671 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-15 20:36:34 +00:00
madmaxoft@gmail.com
e65d28484d Disabled MSVC deprecation / security warnings for external libraries - we expect them to be secure enough
git-svn-id: http://mc-server.googlecode.com/svn/trunk@668 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-15 14:02:05 +00:00
madmaxoft@gmail.com
a9839b968b Squirrel: removed CLR from dependencies (we're not in C#)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@664 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-13 19:30:11 +00:00
lapayo94@gmail.com
d82e2449a0 Improved Squirrel Bindings
Added AddCommand / BindCommand for Squirrel Plugins

git-svn-id: http://mc-server.googlecode.com/svn/trunk@652 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-09 15:53:17 +00:00
lapayo94@gmail.com
81a41c25fc Sorry...
Now everything should work :)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@651 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-09 07:13:08 +00:00
lapayo94@gmail.com
112d968b4a Missed precompiled headers in Release Mode
git-svn-id: http://mc-server.googlecode.com/svn/trunk@650 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-09 07:07:17 +00:00
lapayo94@gmail.com
4b62d1c463 BlockArea name change reverted
fixed VS2008 building

git-svn-id: http://mc-server.googlecode.com/svn/trunk@649 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-09 07:00:28 +00:00
madmaxoft@gmail.com
bf13084f1f cBlockArea object added (with only minimal testing so far)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@641 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-02 16:30:17 +00:00
madmaxoft@gmail.com
c2f340d309 Fixed a (non-fatal) error in the profiling script
git-svn-id: http://mc-server.googlecode.com/svn/trunk@631 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-18 16:28:18 +00:00
cedeel@gmail.com
3ef6ecb8d2 Basic handling of vines. No growth yet.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@615 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-15 15:55:53 +00:00
madmaxoft@gmail.com
be24f193d7 Moved LuaFunctions.h into the Bindings section of the project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@604 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-13 20:31:07 +00:00
madmaxoft@gmail.com
1c60680fba Added a BlockToPickup hook for modifying pickups when a player breaks a block.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@602 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-13 17:37:23 +00:00
madmaxoft@gmail.com
5e6c736859 Updated the crafting recipes architecture to better support crafting hooks. Removed the old recipe file and implementation altogether.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@597 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-12 20:03:46 +00:00
faketruth
373dac3204 Added implementation of E_PLUGIN_CHUNK_GENERATING lua hook
It crashes the server when a plugin actually overrides default behavior though...

git-svn-id: http://mc-server.googlecode.com/svn/trunk@594 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-11 19:25:55 +00:00
madmaxoft@gmail.com
1cca9b13b3 Item-dropping code rewritten and centralized - now there's only one place to modify if we want to split or merge same-item drops: cWorld:SpawnItemPickups(). Also, mined blocks can now drop more items, and they recognize if they're being mined by the correct tool.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@561 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-06 20:18:50 +00:00
madmaxoft@gmail.com
f0e759e2d4 Eliminated unused files from a ToLua library VC2008 project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@552 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-04 15:06:59 +00:00
madmaxoft@gmail.com
b355bdecce Added the new recipe parser, parsing the crafting.txt file. Included are a few recipes. The old parser still works, but will be replaced soon.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@549 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-04 12:08:20 +00:00
madmaxoft@gmail.com
40480fbbd4 Fixed MSVC2008 projects for new zlib
git-svn-id: http://mc-server.googlecode.com/svn/trunk@547 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-04 05:43:42 +00:00
cedeel@gmail.com
b17d12c86f Updated zlib, added chat formatting, fixed upside down stairs and slabs, fixed makefiles, hopefully updated vc project files
git-svn-id: http://mc-server.googlecode.com/svn/trunk@546 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-03 23:35:17 +00:00
madmaxoft@gmail.com
a4a418a679 Merged the composable_generator branch into the trunk
git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-25 07:18:52 +00:00
madmaxoft@gmail.com
5f29a3e134 Fixed output directory structure in the "Release profiled" configuration
git-svn-id: http://mc-server.googlecode.com/svn/trunk@488 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-09 06:31:32 +00:00
madmaxoft@gmail.com
90740aff3c Added a profiling option to the VC2008 projects, using the MS standalone profiler (see vc2008/profile_run.cmd for details and usage)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@482 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-08 09:22:32 +00:00
madmaxoft@gmail.com
35c8bc4c58 Fast NBT Parser (loading a chunk is now about 10 times faster)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@481 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-07 20:22:04 +00:00
madmaxoft@gmail.com
5783437436 Added the new 1.2.4's PlayerAbilities packet; restructures packet files for less files, more dense.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@431 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-24 13:28:53 +00:00
madmaxoft@gmail.com
e1ef489e08 Removed the split between 1.2.3 and 1.1, left only 1.2.3 code
git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-24 11:40:29 +00:00
madmaxoft@gmail.com
0b24efeb00 Split chunk data into separate arrays; decoupled most sources from cChunk.h dependency
git-svn-id: http://mc-server.googlecode.com/svn/trunk@411 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-14 20:56:09 +00:00
madmaxoft@gmail.com
10c8c75bb7 Added a flat terrain generator with settable terrain height
git-svn-id: http://mc-server.googlecode.com/svn/trunk@404 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-12 19:39:41 +00:00
madmaxoft@gmail.com
69a4ee5383 Added the Anvil level format (MCA) support, read-only for the time being. Now MCS can read your worlds from the official server :)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@380 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-07 11:28:24 +00:00
madmaxoft@gmail.com
4d65ffffc0 ChunkSender: Chunks are now compressed and sent to clients from a separate threads, proper passive waiting between threads. Not much tested, just appears to work :)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@365 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-05 16:41:57 +00:00
faketruth
b467f77689 Forgot to update the VS2008 project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@346 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-03-01 15:21:02 +00:00
madmaxoft@gmail.com
bccd52530f VC2008: slight project reorganization, chunk-generation-related sources are now in one folder
git-svn-id: http://mc-server.googlecode.com/svn/trunk@335 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-28 10:07:06 +00:00
madmaxoft@gmail.com
0e33c919dd Using cSocketThreads for client outgoing packets. Unfortunately had to put in one intermediate thread (cServer::cNotifyWriteThread) to avoid deadlocks. Still, seems we have a proper multithreading for clients and no more per-client threads, yay :)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@328 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-26 00:36:51 +00:00
madmaxoft@gmail.com
37415b4297 VC2008: cleaned up the Release configuration for the project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@310 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-22 09:38:36 +00:00
madmaxoft@gmail.com
edb1f1f87f VC2008: Temporarily reset compiler warnings to Level 3 due to the new ASSERT()
git-svn-id: http://mc-server.googlecode.com/svn/trunk@299 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-20 16:40:34 +00:00
madmaxoft@gmail.com
7a9925f982 Added the skeleton of the cLightingThread object
git-svn-id: http://mc-server.googlecode.com/svn/trunk@286 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-17 18:24:34 +00:00
madmaxoft@gmail.com
423f49d175 Chunk is now marked as dirty; saving only dirty chunks; rewritten load / save not to use cChunkPtr; set VC2008 project to level4 warnings; block entities are now loaded and saved properly
git-svn-id: http://mc-server.googlecode.com/svn/trunk@273 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-16 13:42:35 +00:00
madmaxoft@gmail.com
19e711a1e3 Slight cleanup - removed old code, some additional comments on dangerous functions
git-svn-id: http://mc-server.googlecode.com/svn/trunk@261 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-14 21:09:14 +00:00
madmaxoft@gmail.com
4f17362aeb Rewritten most of the code for multithreading; still not 100%, but getting there. If this commit proves to be too problematic, we can always undo it.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-13 21:47:03 +00:00
madmaxoft@gmail.com
16feb0924e cSocketThreads initial commit. Not yet tested and not yet integrated
git-svn-id: http://mc-server.googlecode.com/svn/trunk@239 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-07 07:49:00 +00:00
madmaxoft@gmail.com
48d30d6ab4 Rewritten cAuthenticator to make use of the new cIsThread architecture - now authentication runs in a single separate thread for all clients;
Global player-kicking function (cServer, cRoot);
More char * -> AString conversion

git-svn-id: http://mc-server.googlecode.com/svn/trunk@221 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-01 22:38:03 +00:00
madmaxoft@gmail.com
9d64191ee3 VC2008: removed an unneeded file from zlib project
git-svn-id: http://mc-server.googlecode.com/svn/trunk@219 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-01 14:10:48 +00:00
madmaxoft@gmail.com
83fc392198 new cIsThread object for thread encapsulation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@214 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-01 12:25:26 +00:00
madmaxoft@gmail.com
bb49f0e021 Introducing StringUtils - the place to be if you are a generic string routine :) No more sprintf()!
git-svn-id: http://mc-server.googlecode.com/svn/trunk@209 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-01 09:12:54 +00:00
madmaxoft@gmail.com
7e743398a9 Initial cFile implementation (using stdio FILE) and test in cChunkMap
git-svn-id: http://mc-server.googlecode.com/svn/trunk@192 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-30 13:54:39 +00:00
madmaxoft@gmail.com
89afb970d8 VC2008 / VC2010: Enabled precompiled header through Globals.h; the header included in every module in the project. Compilation optimization.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@188 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-29 19:28:19 +00:00
madmaxoft@gmail.com
f78eef29ee VC2008 compilation with new lua webplugin
git-svn-id: http://mc-server.googlecode.com/svn/trunk@187 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-29 14:33:37 +00:00
madmaxoft@gmail.com
e2ad02f50a ChunkGenerator: rewritten thread-locking using the new RAII CSLock class
git-svn-id: http://mc-server.googlecode.com/svn/trunk@186 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-29 14:29:26 +00:00
madmaxoft@gmail.com
f17dd0f8dc Added a VC2010 configuration for Debug build with optimized Noise; made it the default in VC2008
git-svn-id: http://mc-server.googlecode.com/svn/trunk@181 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-27 14:23:14 +00:00
madmaxoft@gmail.com
90e6dc65b4 Updated VC2008 project to include cPlugin_NewLua
git-svn-id: http://mc-server.googlecode.com/svn/trunk@180 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-27 14:07:51 +00:00
madmaxoft@gmail.com
86158a2d1d MSVC 2008 Express compatibility: Added the projects, modified sources to compile. Tested on MSVC 2008 Express and MSVC 2010 Express
git-svn-id: http://mc-server.googlecode.com/svn/trunk@179 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-01-27 14:04:28 +00:00