swg-source/swg-main
1
0
Fork 0
mirror of https://github.com/SWG-Source/swg-main.git synced 2026-01-16 20:04:18 -05:00
Code Issues Projects Releases Wiki Activity
95 Commits 4 Branches 0 Tags
bed32dd5eea97fccd2ea4a52e9b664d2cfd5250e
Commit Graph

95 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cekis
bed32dd5ee Merge branch 'master' of github.com:SWG-Source/swg-main 2020-11-19 12:11:28 -05:00
Cekis
e34e9d0056 Updating serverdata submodule version 2020-11-19 12:09:39 -05:00
Tekaoh
dca2ba163e Better compatibility 2020-11-09 12:22:01 -05:00
Cekis
ccab4914a5 Merge pull request #12 from SWG-Source/Tekaoh/startup 
startServer.sh as alias of ant start
 2020-11-07 09:43:44 -08:00
Tekaoh
156ff6f663 startServer.sh as alias of ant start 2020-11-07 09:09:08 -05:00
Cekis
3259a0c5f7 Merge branch 'master' of https://github.com/SWG-Source/swg-main 2020-11-06 20:06:49 -05:00
Cekis
edb511e554 Adjusting ant start to use startServer for logging purposes 2020-11-06 19:57:33 -05:00
Tekaoh
91c7483c2f Reduce startup interval 2020-11-05 11:07:17 -05:00
Tekaoh
c4176ad617 Fix ant start 2020-11-05 10:36:18 -05:00
CekisSWG
d3ea9fa70a Revert "Fixed broken strings for the Naboo space station conversation" 
This reverts commit 20a90bdbec.
 2020-10-28 00:52:26 -04:00
CekisSWG
fc4a6f3896 Merge branch 'master' of github.com:SWG-Source/swg-main 2020-10-28 00:52:00 -04:00
CekisSWG
b78d954bbb Reverting 2020-10-28 00:50:22 -04:00
CekisSWG
20a90bdbec Fixed broken strings for the Naboo space station conversation 2020-10-27 23:48:28 -04:00
Tekaoh
7e586809b7 Update submods to latest commits because why not? 2020-09-19 13:36:44 -04:00
Tekaoh
f6ec756b61 Gotta do it before chaning directories though 2020-09-19 13:35:38 -04:00
Tekaoh
656f418224 Download server settings from a web service before startup 2020-09-02 12:22:21 -04:00
CekisSWG
064754c96f Fixed issue with new repo naming to work with SWG requirements 2020-03-30 16:11:02 -04:00
CekisSWG
f470ec30b3 Updated serverdata version. 2020-03-28 18:23:24 -04:00
Cekis
4e25d56155 Update README.md 2020-03-28 15:18:42 -07:00
Cekis
221f82a751 Update README.md 2020-03-28 15:17:15 -07:00
CekisSWG
983408c908 Added serverdata repo submodule 2020-03-28 18:01:24 -04:00
CekisSWG
b50b951b9c Reconfig repos 2020-03-28 17:59:59 -04:00
CekisSWG
b7d58f03b4 Added a few changes to cleanup actions. 2020-03-26 00:44:41 -04:00
CekisSWG
fcc965395c Oops... didn't miff the CIM file. 2020-03-23 13:25:44 -04:00
CekisSWG
9cffe00fac Added new cleanup and copy targets for ACM building 2020-03-23 12:13:13 -04:00
CekisSWG
96c5c291ef Changed ANT ACM commands to follow naming standard 2020-03-23 11:50:03 -04:00
CekisSWG
28ada0792d Revert "Updated ACM process to not add forced data until after sorting and optimizing." 
This reverts commit 5e01ea206e.
 2020-03-23 11:47:09 -04:00
CekisSWG
7d37da4840 Merge branch 'master' of github.com:SWG-Source/swg-main 2020-03-22 19:10:19 -04:00
CekisSWG
5e01ea206e Updated ACM process to not add forced data until after sorting and optimizing. 2020-03-22 19:10:04 -04:00
Cekis
29255d8b02 Add asset name to the ACM output MIF 2020-03-21 12:19:19 -07:00
Tekaoh
530c82fba9 Hash-Bang should stay at the top, though 2020-02-05 17:31:29 -05:00
Cekis
e390d8f509 Merge pull request #9 from ResurgenceDark/patch-1 
Added Kill Process
 2020-02-04 22:11:35 -08:00
Dark
a8997fdf35 Update startServer.sh 2020-01-28 16:29:52 -06:00
Cekis
497fe3f8d1 Updated Vehicle Data root location 2019-10-08 11:47:56 -07:00
Cekis
5a59786759 Removed calls to Perforce to support ACM building 2019-10-04 11:51:02 -04:00
Cekis
f0df57b92a Fixed CRC calculation in Perl module to match server CRC calc 2019-10-04 11:50:29 -04:00
Cekis
aeadb931a1 Added ACM building to ANT build file. 2019-10-04 11:49:57 -04:00
Cekis
3b67a9f8cc Symlinks now overwrite existing symlinks to avoid build failures 2019-09-30 18:52:54 -04:00
Cekis
cf9405b7c3 Added echo to building Template Files 2019-09-20 00:53:44 -04:00
Cekis
b06ae16a18 Added "update_swg" ant target 2019-09-11 14:24:46 -07:00
Cekis
2d33680e01 Added "update_swg" ant target 
new ant target will update all submodules (with exception to changed log files) and then compile all files (where needed).
 2019-09-11 14:24:14 -07:00
Tekaoh
b2633953dd Update README.md 2019-06-22 19:28:40 -05:00
Tekaoh
84ac9b666f Add log files to gitignore 2019-05-14 12:30:03 -05:00
Cekis
d4f93c52cc Fixed service_name error 2019-05-08 14:08:50 -07:00
Cekis
f7803ebd69 Fixed bug on configs that didn't set service name right. 2019-05-07 17:48:12 -07:00
Tekaoh
77cc05a95b Duh... Forgot to finish my last commit 2019-04-22 15:11:16 -05:00
Tekaoh
1b20e31c53 Let's try a different conditional implementation 2019-04-22 15:07:53 -05:00
Cekis
5f10817243 Added conditional that allows specifying a specific branch on submodules 2019-04-20 09:15:05 -07:00
Cekis
39b60a3e4a Added stationapi branch 2019-04-20 09:12:11 -07:00
Cekis
fce3eb5694 Fixed so stationapi submodule would update appropriately 2019-04-20 09:11:27 -07:00