JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,799 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

152 Commits

Author SHA1 Message Date
Shaun Bennett 699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2016-06-09 00:39:39 -05:00
Shaun Bennett 09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
Shaun Bennett 1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
xXVevzZXx 63c44afa10 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 2016-05-13 22:05:27 +02:00
xXVevzZXx 9f2189d173 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2016-05-06 03:40:00 +02:00
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
Conrad d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer 6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
xXVevzZXx aa219ec3e5 Implement gamemode feature with modifiable variables and working on first moded games 2016-04-27 17:42:50 +02:00
Shaun Bennett 41e2ea6490 Fix off by one error in GoalCounter 2016-04-26 16:20:14 +10:00
Shaun Bennett cabf4c4c8b Add BlockProgressBar for Gem Fountain 2016-04-26 15:26:07 +10:00
Shaun Bennett e8370579c0 Counter refactoring 2016-04-26 13:55:06 +10:00
Shaun Bennett cb48df6a3d Update fountain count every 5 seconds. Display Hologram 2016-04-19 14:30:38 +10:00
Shaun Bennett 5a667a7d31 Add /fountain command. Fountain implementation 2016-04-19 13:57:19 +10:00
Shaun Bennett 4477a215f4 Update to Redis 2.8.1 and clean up repositories (#26) 2016-04-16 22:51:20 -05:00
Shaun Bennett 16dacbe3b3 Update to Redis 2.8.1 and clean up repositories 2016-04-17 12:58:44 +10:00
Keir Nellyer 390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-07 14:28:30 +01:00
Jonathan Williams 2fa0787792 Clans now load, added connection property to null zero date timestamps. 2016-04-04 16:31:37 -05:00
Jonathan Williams 60010f90b4 Load simple clan token on player login to reduce overhead. 
Increased dbpool connections to 4
 2016-04-04 13:47:45 -05:00
Joseph Prezioso Jr 97f5b60404 Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 13:56:05 -05:00
NewGarbo ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-05 23:14:32 +00:00
Keir Nellyer b18f2d8682 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-03-02 20:02:09 +00:00
Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
Shaun Bennett 3a73b05895 Fix for ServerMonitor not loading database config 2016-02-20 00:48:30 -06:00
Shaun Bennett 82d51a896f Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Shaun Bennett 8d7453b78e Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 19:33:52 -06:00
Shaun Bennett 7032568a92 Add PLAYER_STATS DBPool 2016-02-19 19:33:39 -06:00
md_5 a84f8dd2d0 Fix dbcp, tone down sentry 2016-02-19 20:28:22 +11:00
md_5 81f9ca0bc2 Fix mysql 2016-02-19 20:10:01 +11:00
Shaun Bennett 3b10207503 Class.forName! 2016-02-19 02:40:14 -06:00
NewGarbo 67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo 441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00
NewGarbo d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
Keir Nellyer 9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-31 17:38:08 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
Shaun Bennett b9354b7972 Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00
Keir Nellyer ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Keir 7ce028203b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-08 13:59:43 +00:00
Keir abc15e3a4c Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors. 2016-01-07 06:58:21 +00:00
Morten 7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Shaun Bennett 618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett f8ef46abde Merge master code into clans 2015-09-28 21:41:05 -04:00
Jonathan Williams b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Ty Sayers c1b356e42f Fix asynchronous race conditions in ServerData. 2015-08-29 19:05:14 -07:00
Ty Sayers 5df7a5e0c9 Fix bugs related to multiple server UI and clan server transferring. 2015-08-29 17:31:54 -07:00
Ty Sayers aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Jonathan Williams e47662f855 Added LoginTime setting as RedisTime for use in calculating time on server. 
Optimized redis util for time calls to calculate time different and only pull redis time once.
 2015-08-28 21:44:00 -07:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00