Commit graph

193 commits

Author SHA1 Message Date
Dark98
62892eed95 Merge https://github.com/dginovker/RS-2009 2019-11-07 14:28:21 +00:00
Dark98
f6c2f1f8e5 Fix Server Setings 2019-11-07 14:27:23 +00:00
Daniel Ginovker
737f76eff2 Merge pull request #29 from Dark98/master
Check Commits :p
2019-11-07 07:47:44 -05:00
Dark98
1681ba613a Stripped Global Events Manager
This Was Responsible for Custom Game Events that shouldn't be in a remake
2019-11-07 05:38:08 +00:00
Dark98
ba6a158ce2 Change Starter to Official Starter Pack
closes #24
2019-11-07 05:04:03 +00:00
Daniel Ginovker
b6d996c7b1 Merge pull request #28 from verinia/Fix-cache
Fix cache
2019-11-06 21:36:08 -05:00
Daniel Ginovker
3db02c8eda Merge branch 'master' into Fix-cache 2019-11-06 21:35:56 -05:00
Daniel Ginovker
1785834efa Merge pull request #27 from dginovker/revert_.ideas
Fix broken .ideas folder
2019-11-06 21:34:10 -05:00
dginovker
01a89b0995 Fix broken .ideas folder 2019-11-06 21:33:20 -05:00
Ethan
110cb5d97b cache fix 2019-11-06 21:31:18 -05:00
Ethan
5d5faecb2f start 2019-11-06 21:21:16 -05:00
Ethan
6ef67bf5f5 Merge branch 'first' 2019-11-06 20:39:09 -05:00
Ethan
7fa0c67804 hmm 2019-11-06 20:38:43 -05:00
Daniel Ginovker
813764226c Merge branch 'master' into first 2019-11-06 20:30:10 -05:00
Ethan
e079ba9102 test push 2019-11-06 20:14:14 -05:00
Daniel Ginovker
b8c5cf8f3a Merge pull request #25 from dginovker/update_readme
Update readme
2019-11-06 20:12:40 -05:00
dginovker
bddd36bcdb Update readme 2019-11-06 20:11:50 -05:00
Ethan
58701e88ba hmm 2019-11-06 19:55:28 -05:00
Ethan
b7332eaea9 Lots of changes 2019-11-06 19:51:48 -05:00
Ethan
5b64afe99d cache bs 2019-11-06 19:32:32 -05:00
Ethan
157be0fab6 Fixed fog 2019-11-06 19:29:47 -05:00
dginovker
dd81481af9 Latest compile 2019-11-06 11:08:47 -05:00
Daniel Ginovker
88295dd15a Merge pull request #20 from RedSparr0w/management-server
Clan changes
2019-11-06 10:56:15 -05:00
RedSparr0w
5bc054752d remove default clan "grim" 2019-11-06 13:55:21 +13:00
RedSparr0w
4f12448e10 Merge remote-tracking branch 'upstream/master' into management-server 2019-11-06 13:43:45 +13:00
RedSparr0w
14bd13c5ae don't ignore .class files, compiled server 2019-11-06 13:42:18 +13:00
RedSparr0w
1bfb041239 eh 2019-11-06 13:38:44 +13:00
RedSparr0w
0c326b548e update database, default clan, sql stuff 2019-11-06 13:37:45 +13:00
dginovker
ea9b399d93 make runServer import the correct plugin folder 2019-11-05 16:50:12 +00:00
dginovker
dda1838060 Update .gitignore to submit new compiles + missing class compiles 2019-11-05 11:47:06 -05:00
dginovker
df497818fc Update plugins on run too 2019-11-05 12:42:29 +00:00
Daniel Ginovker
13171d3d78 Merge pull request #18 from dginovker/add_artifacts
Add artifacts to create .jars
2019-11-04 16:19:34 -05:00
dginovker
7ea58f6805 Add artifacts & metas 2019-11-04 16:17:50 -05:00
dginovker
cd54b1533e Reverting this file 2019-11-03 14:14:43 -05:00
dginovker
7025675aa5 Latest compile 2019-11-03 12:16:14 -05:00
Daniel Ginovker
6a5f984e06 Merge pull request #17 from RedSparr0w/master
A bunch of changes
2019-11-03 11:21:34 -05:00
RedSparr0w
41aa337465 add launch param for server 2019-11-03 13:31:04 +13:00
RedSparr0w
1d50eb2bf8 Update workspace.xml 2019-11-03 12:48:31 +13:00
RedSparr0w
965e1b37ed update compiled server, fix instructions error 2019-11-03 12:36:34 +13:00
RedSparr0w
8f9bf6ad5c delete non needed files 2019-11-03 12:21:44 +13:00
RedSparr0w
8046392c5b another fixup 2019-11-03 12:15:28 +13:00
RedSparr0w
79aec97f54 fixup 2019-11-03 12:09:42 +13:00
RedSparr0w
4b21a1fec7 add global_events table 2019-11-03 11:44:51 +13:00
RedSparr0w
d6482df67f a bunch of changes 2019-11-03 11:28:49 +13:00
Daniel Ginovker
fb0967416a Merge pull request #16 from dginovker/revert-14-master
Revert "Bunch of changes"
2019-11-02 18:13:55 -04:00
Daniel Ginovker
bea505f34a Revert "Bunch of changes" 2019-11-02 18:13:40 -04:00
Daniel Ginovker
4c780b09ad Merge pull request #14 from RedSparr0w/master
Bunch of changes
2019-11-02 18:07:20 -04:00
RedSparr0w
e42054e76f Merge remote-tracking branch 'upstream/master' 2019-11-03 10:59:45 +13:00
Daniel Ginovker
5f1239dee4 Merge pull request #13 from mikeysasse/master
Few changes in anticipation of rebotted.
2019-11-02 17:24:18 -04:00
dginovker
5e3d85718d mikeysasse merge prep 2019-11-02 17:24:01 -04:00