1
0
Commit Graph

5829 Commits

Author SHA1 Message Date
Tiger Wang
6167c79e7a Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
madmaxoft
e69a11012f Merged branch 'master' into VillageGen. 2014-05-18 23:10:23 +02:00
madmaxoft
ec50c0f9e1 Updated SandVillage prefabs to latest Gallery content.
This fixes sand village generation.
2014-05-18 23:09:39 +02:00
madmaxoft
a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00
madmaxoft
e09a04a23a Fixed datatype truncation in Diff() template. 2014-05-18 22:36:31 +02:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager
Statistic Manager
2014-05-18 22:30:34 +02:00
worktycho
16dbad8107 Merge pull request #1005 from SphinxC0re/LoadPluginfolder
Load pluginfolder
2014-05-18 16:48:32 +01:00
Julian Laubstein
40ce737a7e removed the <list> include 2014-05-18 17:30:21 +02:00
Julian Laubstein
cfd3c33dfa Added unload <pluginname> command 2014-05-18 17:16:02 +02:00
Tycho
8a0d3f7921 Fixed issue with types not being defined for an unused parameter 2014-05-18 15:37:17 +01:00
madmaxoft
a7e52e51dc Village roads are drawn properly. 2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61 Village houses are height-adjusted onto the terrain. 2014-05-17 21:54:04 +02:00
Julian Laubstein
19f4cd0547 Added load cmd 2014-05-17 19:39:16 +02:00
Julian Laubstein
6951b68aaf Added load command in the cServer class 2014-05-17 18:38:33 +02:00
Tycho
f451075c1f derp 2014-05-17 15:32:28 +01:00
Tycho
016b8f7b99 C++11 2014-05-17 15:19:35 +01:00
Tycho
1f98f21dd1 fixed assignment bugs and Skylight bug 2014-05-17 15:11:58 +01:00
worktycho
7616895eb3 Fix assignment operators test 2014-05-17 14:35:08 +01:00
worktycho
4e841146b8 Fix assignment ops 2 2014-05-17 14:29:15 +01:00
worktycho
d53c84a781 Add test for zeros 2014-05-17 14:07:49 +01:00
worktycho
7777da379d Fix assignment operators 2014-05-17 14:04:44 +01:00
worktycho
a7a811af3a Add tests for assignment operator 2014-05-17 13:59:31 +01:00
worktycho
710656f84f Rewrote array copies test
Moved each patten test into its own scope to test all unallocated section code paths.
Moved 0's around so that they test the allocated sections code paths.
2014-05-17 13:39:28 +01:00
worktycho
4697133075 excluding tests excludes everything 2014-05-17 13:20:28 +01:00
worktycho
029e9a826a test code does not need testing 2014-05-17 13:05:12 +01:00
worktycho
8bb8c2ca7d Don't start mcserver up in coverage builds
Starting the server up is not a test.
2014-05-17 13:04:40 +01:00
madmaxoft
fc5c3abcba Updated PlainsVillage prefabs to the latest Gallery contents. 2014-05-17 02:26:44 +02:00
Howaner
989312c4e7 Add more move checks
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
2014-05-16 22:04:19 +02:00
Mattes D
b23baa6f3a Merge pull request #1002 from tonibm19/patch-1
Fixed anvil exp removing
2014-05-16 20:43:16 +02:00
tonibm19
5724dcc2c1 Fixed anvil exp removing 2014-05-16 19:33:57 +02:00
Mattes D
0e43f88668 Merge pull request #994 from Howaner/GlobalFixes
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
2014-05-15 21:16:04 +02:00
Howaner
28a9c16db2 Fix compile error. 2014-05-15 19:59:52 +02:00
Howaner
6c5ff597bb Move radius check. 2014-05-15 19:58:48 +02:00
madmaxoft
70b0547499 Fixed a NULL ptr failure in GridStructGen.
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9 Changed village generator defaults to more reasonable values. 2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164 Changed village road generation to use multiple prefabs. 2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29 VillageGen rewritten using BFSPieceGenerator.
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834 cPrefab can be constructed in code. 2014-05-15 00:12:01 +02:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
Mattes D
0685fb5258 Added doxy-comment requirement 2014-05-13 08:48:33 +02:00
madmaxoft
9c8e8ef7ae VillageGen: Added well placement and the general algorithm description. 2014-05-12 22:43:59 +02:00
andrew
aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
Mattes D
702643d7e6 Merge pull request #999 from mc-server/fixes
A few warning fixes
2014-05-12 08:51:07 +02:00
archshift
3a5e04d118 More switch warnings. 2014-05-11 16:54:42 -07:00
archshift
3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
archshift
6c57b38b74 Fixed a warning and a complaint about a never-read variable. 2014-05-11 13:44:30 -07:00
madmaxoft
c0727c4265 Initial VillageGen implementation.
WIP, doesn't generate anything yet.
Ref.: 740.
2014-05-11 22:35:41 +02:00
Mattes D
e0c56b7522 Merge pull request #972 from mc-server/SslWebAdmin
Ssl web admin
2014-05-11 20:59:15 +02:00
andrew
6cb3483954 Fixed compilation 2014-05-11 21:41:25 +03:00