NewGarbo
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
Cheese
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
Cheese
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
NewGarbo
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
NewGarbo
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
Shaun Bennett
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
Sarah
32ee1c285a
merging pregametutorial into type wars.
2015-11-26 00:29:28 +01:00
Sarah
063299ab3a
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 00:23:02 +01:00
Sarah
809faf3098
changing teleport mechanic.
2015-11-26 00:14:15 +01:00
Shaun Bennett
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
Thanos paravantis
941c996085
Update mineware class. Add underscore in variable name.
2015-11-25 23:18:27 +02:00
Thanos paravantis
e0bb8f60d4
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeAnvilDance.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBlockLobbers.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBuildRace.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFallingBlocks.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFastFood.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeWaveCrush.java
2015-11-25 23:14:22 +02:00
Thanos paravantis
ec01940dde
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-11-25 23:12:52 +02:00
Thanos paravantis
db8781cacb
Merge branch 'master' into thanos-mineware
2015-11-25 23:05:14 +02:00
Thanos paravantis
104beef730
Update branch with latest fishing day version.
2015-11-25 23:03:02 +02:00
Shaun Bennett
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
NewGarbo
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
NewGarbo
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
xGamingDudex
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
Sarah
de9262882a
fixing "enemy's" and some merge isssues.
2015-11-25 16:03:13 +01:00
xGamingDudex
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
Cheese
f668ae6082
ms smoke
2015-11-25 17:49:18 +11:00
Cheese
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
Cheese
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
NewGarbo
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
NewGarbo
bbdbb209c5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-25 00:55:37 +00:00
NewGarbo
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
NewGarbo
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
libraryaddict
ecf42803f9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-11-25 13:42:31 +13:00
libraryaddict
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
NewGarbo
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
NewGarbo
6220ce14fe
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-24 23:04:24 +00:00
NewGarbo
98edd0a452
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
2015-11-24 23:03:19 +00:00
NewGarbo
81c2d2a11f
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
2015-11-24 22:49:28 +00:00
NewGarbo
31afe9f886
removed debug message from undead camp
2015-11-24 22:29:20 +00:00
Shaun Bennett
57302221df
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-24 17:27:46 -05:00
Shaun Bennett
cb7422b4fe
Re-enable world events
2015-11-24 17:27:35 -05:00
NewGarbo
befe4d129d
formatted PlayerGear.java (to avoid further confusion)
2015-11-24 22:21:01 +00:00
NewGarbo
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
Sarah
fac7d152ae
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
2015-11-24 16:25:44 +01:00
Sarah
2a64d06bdd
removing some debug.
2015-11-24 16:24:22 +01:00
Sarah
95b4ad74e8
fixed silencing and adding possibilty to change text.
2015-11-24 16:23:03 +01:00
Sarah
7708f879dc
Fixing attack damage.
2015-11-24 16:15:07 +01:00
Sarah
49f6679537
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-11-24 15:43:59 +01:00
Sarah
46362a3d5f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-24 15:38:52 +01:00
Cheese
d66bad572f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 22:19:59 +11:00
libraryaddict
5799edae50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-24 23:45:42 +13:00
libraryaddict
ddf7528796
Updated CB
2015-11-24 23:45:22 +13:00
