Cheese
|
4a70e4da90
|
more fixies
|
2015-11-21 10:34:08 +11:00 |
|
Cheese
|
4d128d9c7a
|
fixed some skills and wierd hitbox error
|
2015-11-21 10:29:48 +11:00 |
|
Cheese
|
c7297a7a38
|
fixed invalid proxies exploding
|
2015-11-21 09:45:01 +11:00 |
|
Cheese
|
d5076b1c47
|
CTF fix
|
2015-11-21 09:41:02 +11:00 |
|
Cheese
|
e0885feea6
|
Merge branch 'master' into alex-ctf
|
2015-11-21 09:40:07 +11:00 |
|
Cheese
|
04be896ff6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-21 09:39:50 +11:00 |
|
Sarah
|
97471b0d9c
|
Finalizing Game Tutorials.
|
2015-11-20 23:38:02 +01:00 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +11:00 |
|
Cheese
|
cfc0aa7d05
|
reverted to size 2 ball
|
2015-11-21 08:20:02 +11:00 |
|
NewGarbo
|
17e62f1f5a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-20 18:31:37 +00:00 |
|
NewGarbo
|
fb04fac0f6
|
removed debug message
|
2015-11-20 18:31:14 +00:00 |
|
Sarah
|
6f7d49b71b
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-20 19:04:51 +01:00 |
|
Sarah
|
2a4d20650a
|
Saving for branch switching.
|
2015-11-20 19:04:11 +01:00 |
|
AlexTheCoder
|
386032a4f5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 06:03:30 -05:00 |
|
AlexTheCoder
|
f51358552a
|
-B
|
2015-11-20 05:57:29 -05:00 |
|
NewGarbo
|
521aa8d965
|
fixed furnaces in undead camp
|
2015-11-20 09:14:57 +00:00 |
|
NewGarbo
|
08f683aa98
|
gave Archers in undead camps the barbed arrows effect
|
2015-11-20 07:49:28 +00:00 |
|
Cheese
|
3067d9f281
|
final push for the day
|
2015-11-20 15:22:43 +11:00 |
|
Jonathan Williams
|
700e4c9a1f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-19 22:12:08 -06:00 |
|
Jonathan Williams
|
411d6fdb22
|
Made PlayerTracker use existing code for determining region.
|
2015-11-19 22:11:45 -06:00 |
|
Cheese
|
ed2f3a064c
|
MORE ML!
|
2015-11-20 14:31:01 +11:00 |
|
Mysticate
|
3f37b893d3
|
Worked on double.
|
2015-11-19 20:29:20 -05:00 |
|
Cheese
|
3a5ab3f17c
|
Merge branch 'master' into monster-league
|
2015-11-20 11:51:07 +11:00 |
|
Cheese
|
1cc92cea1b
|
and the files
|
2015-11-20 11:50:33 +11:00 |
|
Cheese
|
c4745c18b6
|
ML update
|
2015-11-20 11:50:20 +11:00 |
|
Mysticate
|
f7011032bc
|
Switching branches
|
2015-11-19 19:49:46 -05:00 |
|
Mysticate
|
f02e2b2e72
|
Formatting
|
2015-11-19 18:02:07 -05:00 |
|
Mysticate
|
e816a79f37
|
Reformatted
|
2015-11-19 17:51:25 -05:00 |
|
Mysticate
|
502f12f00f
|
Fixed paintball to the max. :>>
|
2015-11-19 17:46:07 -05:00 |
|
Cheese
|
e14f5a36bd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-20 08:34:19 +11:00 |
|
Cheese
|
f33eedf36d
|
text fix
|
2015-11-20 08:33:51 +11:00 |
|
Sarah
|
0fedb99660
|
Changing the tutorial visuals and texts.
|
2015-11-19 21:04:50 +01:00 |
|
Shaun Bennett
|
c29fd242ca
|
Forgot to remove the unnecessary check
|
2015-11-19 14:46:01 -05:00 |
|
Sarah
|
ad280c96c9
|
adding interactive Chat elements.
|
2015-11-19 20:45:40 +01:00 |
|
Shaun Bennett
|
f47a61e38e
|
Use bounds for energy tracker messages aren't displayed multiple times
|
2015-11-19 14:44:03 -05:00 |
|
Shaun Bennett
|
63e580404c
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
|
2015-11-19 14:36:08 -05:00 |
|
Shaun Bennett
|
3820035762
|
Cleaning up duplicate code/small optimizations (untested)
|
2015-11-19 14:35:59 -05:00 |
|
NewGarbo
|
b0c60fd1f4
|
sparkly rare items! woo. and fixed gold dropping waaayyy too much
|
2015-11-19 19:03:51 +00:00 |
|
NewGarbo
|
7d8e1b517d
|
Fixed dropped gold stacking...
|
2015-11-19 08:56:07 +00:00 |
|
NewGarbo
|
f262a22913
|
Fixed loot dropping in King of the Hill not dropping correct items/
|
2015-11-19 08:54:59 +00:00 |
|
NewGarbo
|
6372dfd629
|
fixed ArithmeticException / 0 in ClansEnergyTracker.
|
2015-11-19 08:29:50 +00:00 |
|
Virizion
|
975b1df477
|
Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.
|
2015-11-18 22:03:04 -05:00 |
|
fooify
|
6d0879a175
|
Re-fixed Barbarian bug
|
2015-11-18 17:31:28 -08:00 |
|
Virizion
|
796f116cfd
|
Merge branch 'master' into virizion_speed_builder
|
2015-11-18 19:27:42 -05:00 |
|
Virizion
|
937d024ea5
|
Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...
|
2015-11-18 19:26:19 -05:00 |
|
NewGarbo
|
0a667afeb1
|
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
|
2015-11-18 22:27:01 +00:00 |
|
Sarah
|
d7d11e57e5
|
Merge pull request #76 in MIN/mineplex from william-global to master
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
Hub fix
testing excludes
|
2015-11-18 15:49:18 -06:00 |
|
William Burns
|
4620a5a162
|
Hub fix
|
2015-11-18 21:47:52 +00:00 |
|
Sarah
|
a8ba1f1ea6
|
some perspektive changes to the tutorial and removing prepare timer.
|
2015-11-18 22:33:47 +01:00 |
|
Virizion
|
76db2710ae
|
It should have been all got the build 100% correct not all got the same score.
|
2015-11-18 16:10:44 -05:00 |
|