1
0
Commit Graph

2879 Commits

Author SHA1 Message Date
Mattes D
ced076c561 Merge pull request from mc-server/arrows
Fixed arrow bugs
2013-11-19 01:13:49 -08:00
Mattes D
208f2397f4 Merge pull request from mc-server/redstone
Redstone Megacommit
2013-11-19 01:12:23 -08:00
madmaxoft
7567f19052 Merge branch 'master' of git://github.com/nesco/MCServer. 2013-11-19 10:01:25 +01:00
madmaxoft
e2ea6b59f5 APIDump: Slight performance improvement.
Strings don't need concatenation when using write().
2013-11-19 09:56:36 +01:00
Tiger Wang
f06d686f63 Possible compile fix
Also removed unneeded variables.
2013-11-19 07:49:02 +00:00
madmaxoft
4844422e06 APIDump: Documented Vector3i. 2013-11-19 06:49:21 +01:00
Tiger Wang
bc1e236d54 Redstone Megacommit [SEE DESC]
+ Updated BlockID - look for yourself
* Improved button, repeater, lever, and comparator code ->
simplification and splitting of some stuff from the redstone simulator
file
* Fixed buttons not breaking when in an invalid game state
* Fixed QueueSetBlock -> improved (AGAIN) piston code
+ Rewrote redstone simulator

Fixes: , , , and part of .
Fixes FS issues: 281, 116, and 102
2013-11-18 22:30:34 +00:00
nesco
44385fba28 flower=38 2013-11-18 16:55:30 +01:00
madmaxoft
b5821998b4 Mineshafts: silenced a compiler warning. 2013-11-17 23:29:17 +01:00
madmaxoft
9bc79722c7 APIDump: Documented Vector3f. 2013-11-17 23:27:07 +01:00
Mattes D
5277360098 Merge pull request from mc-server/warningfixes
Fix Some Compiler Warnings
2013-11-17 14:26:53 -08:00
Mattes D
d169a1959d Merge pull request from marmot21/playerxp
Playerxp
2013-11-17 14:12:09 -08:00
nesco
416292a824 Blank Line added 2013-11-17 17:41:58 +01:00
Daniel O'Brien
165934fc26 fix *.sdf? 2013-11-17 09:43:26 +11:00
Tiger Wang
6ff6929ca6 General fixes [SEE DESC]
* Fixed faulty block face enumeration and functions
+ Added fireworks and exp bottle spawning
* Fixed arrows again
2013-11-16 20:58:17 +00:00
Alexander Harkness
dbf2982e52 And another... 2013-11-16 18:58:38 +00:00
Alexander Harkness
f4f906563f another 2013-11-16 18:58:17 +00:00
Alexander Harkness
ef8ac545d8 Fixed another one. 2013-11-16 18:57:03 +00:00
Alexander Harkness
0150de3688 Fixed some unsigned int comparison warnings. 2013-11-16 18:55:49 +00:00
Alexander Harkness
755fe9cb21 WaveNoise not used, removing. 2013-11-16 18:54:01 +00:00
Alexander Harkness
45aebbd5ab This is a copy-paste fail, right? 2013-11-16 18:52:48 +00:00
Alexander Harkness
9ac95fc24a Got rid of yet another unused variable. 2013-11-16 18:50:33 +00:00
Alexander Harkness
c1880e1162 Got rid of another unused variable. 2013-11-16 18:47:25 +00:00
Alexander Harkness
eb77bfc1b3 Those variables weren't used.
It seems strange for them to be there, is the code written wrong?
2013-11-16 18:46:06 +00:00
Alexander Harkness
5687ca7bad Fixed another one... 2013-11-16 18:44:19 +00:00
Alexander Harkness
a319973e50 Fixed yet another unsigned integer comparison. 2013-11-16 18:43:40 +00:00
Alexander Harkness
d3360051b1 Fixed typo causing buggy code. 2013-11-16 18:37:43 +00:00
Alexander Harkness
f217981de9 Fixed another unsigned integer comparison. 2013-11-16 18:34:54 +00:00
Alexander Harkness
574e8f1419 Fixed unsigned integer comparison. 2013-11-16 18:27:30 +00:00
Alexander Harkness
5337fee8e0 Fixed a warning about brackets.
Is this the right way round? This is how C++ interprets it, so it should be changed if this is the wrong way round.
2013-11-16 18:26:46 +00:00
Alexander Harkness
9060fbf4b5 Fixed a warning about unsigned int comparison - probably was a real issue. 2013-11-16 18:15:12 +00:00
Alexander Harkness
ab676060fa Revert "Silenced another warning."
This reverts commit dc94b92753.
2013-11-16 17:54:18 +00:00
Alexander Harkness
33e1439c80 Revert "Silenced yet another not completed enum warning."
This reverts commit 444e6e4fa7.
2013-11-16 17:53:55 +00:00
Alexander Harkness
2f2fe8ab0c Revert "Fixed another one."
This reverts commit 3328c80aec.
2013-11-16 17:53:27 +00:00
Alexander Harkness
eca23ed0b3 Always warn about everything!
This should help me in my efforts.
2013-11-16 17:49:14 +00:00
madmaxoft
1480d6d64d LineBlockTracer: Using the coord-based block faces. 2013-11-16 17:11:32 +01:00
Daniel O'Brien
07b7a419fe removed *.sdf file 2013-11-17 01:06:54 +11:00
Daniel O'Brien
cd1c405894 minor change in LOGD call 2013-11-17 00:13:53 +11:00
Daniel O'Brien
c7f38761ed removed magic number 2013-11-16 22:46:27 +11:00
Daniel O'Brien
d2d8b1d073 edited comment and changed error behavior of DeltaXp 2013-11-16 22:43:42 +11:00
Daniel O'Brien
b3bb34974f updated plugin again... 2013-11-16 22:17:46 +11:00
Daniel O'Brien
25ccc33252 updated plugin 2013-11-16 22:05:34 +11:00
Daniel O'Brien
b72ced3164 removed SpendExperience and changed AddExperience to handle removing Xp 2013-11-16 22:00:45 +11:00
Daniel O'Brien
3595392937 fixed bug and added SpendExperience() 2013-11-16 21:38:57 +11:00
Daniel O'Brien
c0c8fe1bcd fix possible threadlock issue, changed function names to be closer to standard 2013-11-16 20:29:57 +11:00
Daniel O'Brien
df4aa6c864 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-16 17:30:19 +11:00
Tiger Wang
7a0d2033b6 Switchified If, ElseIf statement
Also updated comments
2013-11-15 22:47:57 +00:00
madmaxoft
d96f622437 APIDump: Documented lxp, the XML parser class. 2013-11-15 22:39:27 +01:00
madmaxoft
905cd0e73e APIDump: Functions that are documented are never ignored.
This simplifies exclude-filters for functions such as lxp.new() that need inclusion.
2013-11-15 22:39:02 +01:00
Daniel O'Brien
a94a6d48a0 alignment fixes :) 2013-11-16 02:32:04 +11:00