CekisSWG
|
0c26a6111c
|
Squashed commit of the following:
commit b499feffaca921d7303b0e9d41c5a95f4d37cc92
Merge: cd4eadc 07174ee
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Apr 19 08:15:37 2019 -0700
Merge branch 'master' into ant_build
# Conflicts:
# build_linux.sh
commit cd4eadc50a782241b393a55808b6c1c610109f47
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Apr 19 08:15:03 2019 -0700
Updated submodules
commit 30033e17cf8d7e871414e9e83496c823af9f3a7f
Author: CekisSWG <cekisswg@gmail.com>
Date: Mon Mar 18 23:30:43 2019 -0400
updated dsrc submodule version
commit 3c938006373d128fc6d354a65740c9a841cde685
Author: CekisSWG <cekisswg@gmail.com>
Date: Sat Mar 16 20:55:24 2019 -0400
Fixed some unneeded Java 11 changes
commit 8cecdea1f3a3e7df4892529cfcf292eceaaaa48f
Author: CekisSWG <cekisswg@gmail.com>
Date: Sat Mar 16 20:18:52 2019 -0400
Updated build.xml to not pull before compiling
commit 099e5572fb09667042d9b475d77717c06eb95d24
Merge: 64706b1 3dffac9
Author: CekisSWG <cekisswg@gmail.com>
Date: Thu Mar 14 17:03:29 2019 -0400
Merge branch 'ant_build' of github.com:SWG-Source/swg-main into ant_build
commit 64706b1180a45f8936d8ca3fa0077c5fe209e5ab
Author: CekisSWG <cekisswg@gmail.com>
Date: Thu Mar 14 17:03:19 2019 -0400
Updated Ant build to now checkout specific branches
commit 3dffac9e7aedee902768e0e2dcc7f0c4dc3c6731
Author: Cekis <Cekis@users.noreply.github.com>
Date: Mon Mar 11 00:06:41 2019 -0700
Update README.md
commit 8ae089e291b7dcfe60f3a940225aea47d6ba2c05
Author: Cekis <Cekis@users.noreply.github.com>
Date: Mon Mar 11 00:05:50 2019 -0700
Update README.md
commit f8820a00ec3db600460534b4e400d0689c2d26da
Author: CekisSWG <cekisswg@gmail.com>
Date: Mon Mar 11 02:59:27 2019 -0400
Modified build script to accomodate submodules
commit 99987dce77061cd45d7ae82a334917f472219c65
Author: CekisSWG <cekisswg@gmail.com>
Date: Mon Mar 11 02:33:40 2019 -0400
Added config repo
commit b28e57b4ba07a5ea63973b04e7143f50cf099d59
Author: CekisSWG <cekisswg@gmail.com>
Date: Sun Mar 10 15:23:25 2019 -0400
Updated per new submodule usage.
commit 169d6c3f71ddee74ae2b07d5faa5407b0d32c8bf
Author: CekisSWG <cekisswg@gmail.com>
Date: Sun Mar 10 14:55:55 2019 -0400
Adding submodules to swg-main repo for easier usage.
commit fd865d971d9004b9b80c8b03a8483dccd926b249
Merge: c604a07 a8b9067
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Sun Mar 10 12:03:28 2019 -0500
Merge remote-tracking branch 'origin/master' into ant_build
commit c604a07b51ea27bd3513c938f2f486bda6e89f48
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Sun Mar 10 11:51:21 2019 -0500
Update gitignore
commit e0c2b752ecbcac05ccc6c615a7a09ff75d5a0dce
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Sun Mar 10 11:48:26 2019 -0500
Remove stationapi/ from swg-main. It's getting its own repo.
commit d6b5d90a2cd5b9a8ea3ec41298fbf92c706f70bc
Author: SWG <swg@swg.swg>
Date: Wed Mar 6 23:59:17 2019 -0500
Added moving chat binaries to base dir for build chat target
commit 6679836f0157926dfffd3feebcf17061797a3aab
Author: SWG <swg@swg.swg>
Date: Wed Mar 6 23:49:08 2019 -0500
Fixed issue where more than one cluster of the same name could be added to the system.
commit cb8ab05d7e64e0c89705d09f3bbbf1a3ddc22a7c
Author: SWG <swg@swg.swg>
Date: Wed Mar 6 17:06:47 2019 -0500
fixed merge issues
commit d15dde6ae5b9a997532be2b9548d482068e42c18
Merge: 33fac3c 5f452c7
Author: SWG <swg@swg.swg>
Date: Wed Mar 6 17:00:41 2019 -0500
Added initial compile chat server target
commit 33fac3cafb01b353aadbcfb13fd3353e81697581
Author: SWG <swg@swg.swg>
Date: Wed Mar 6 16:59:48 2019 -0500
Added initial compile chat server target
commit 5f452c7817a59c4b6d6a221da4e8fe85e9b50ff6
Author: Cekis <Cekis@users.noreply.github.com>
Date: Sat Mar 2 21:25:03 2019 -0800
fixed service_name bug
commit 27e6c912f83eb94c30273c3c7baad611c140f734
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 16:25:03 2019 -0600
Set default to something harmless
commit d5f3b42dd204c7cd13c890c35c232012143222d2
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 13:31:40 2019 -0600
Instruct users to make their own local.properties if they want to
commit 915ff5adecdcf60aa0f703eb5f8695013ef09509
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 13:29:01 2019 -0600
Remove sample local.properties... bummer
commit 68d224850b430f8c8c216d2b7cfa35c7fe749180
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 12:55:10 2019 -0600
typos... /facepalm
commit eb9f6c92cddc38da0ead50c072742461f95cfd7e
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 12:47:45 2019 -0600
gitignore local.properties so that settings users change don't mess with future git pulls
commit 70b336ee148afb659729fcba4312b9032a2207a3
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 12:45:33 2019 -0600
Add local.properties so users can change things if they want to
commit 09bc9094c416db0f8bcaa8f20b905ee403657a4f
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date: Thu Feb 21 09:09:38 2019 -0600
Delete depreciated update script
commit bf979ebdc28887a2a5632b0d39f8c6d186a6ac77
Author: SWG <swg@swg.swg>
Date: Wed Feb 13 01:35:31 2019 -0500
Fixed bug caused by bad reference
commit 550ba4660fe4ed7855f0bbe91545be6edd02c654
Author: SWG <swg@swg.swg>
Date: Tue Feb 12 18:54:45 2019 -0500
Added targets to configure settings
commit 26f352ed32a374e2135dd86513933027eeffcc16
Author: SWG <swg@swg.swg>
Date: Tue Feb 12 12:32:48 2019 -0500
Fixed bugs with ant script
commit 569b62783a2c58b217ea1ba549fe30283923328e
Author: Cekis <cekisswg@gmail.com>
Date: Fri Feb 8 14:13:42 2019 -0500
Updated build.xml to handle compiler better and set default to GCC and Release mode
commit d66964b27776ee22147b2b10a5d7e5c6b8eab65d
Author: Cekis <cekisswg@gmail.com>
Date: Sun Jan 27 19:29:20 2019 -0500
Added force kill for SwgGameServer processes
commit 2233d2dea70b1dfda11dbb0b123d37766df5e6eb
Merge: d322a0e a7cddbd
Author: Cekis <cekisswg@gmail.com>
Date: Sun Jan 27 19:08:43 2019 -0500
Merge branch 'master' of https://github.com/SWG-Source/swg-main into ant_build
commit d322a0eb93ea70726ae089a23db69c3ea6a92a02
Author: Cekis <Cekis@users.noreply.github.com>
Date: Sat Jan 19 10:36:54 2019 -0800
Update README.md
commit af69d76ffff17fc4f4886a4caffb394ce7fa2841
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 16:44:47 2018 -0800
Updated changes to SQLPlus targets
commit 3b0bf10c0dff0ac9de2e66ee5a8789a467ab505e
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 21:38:19 2018 +0000
Adjusted for missing LD_LIBRARY_PATH var - oops
commit 2a25db52d959b0430fc6b62ceba7b8bb8059ea5b
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 21:31:20 2018 +0000
Adjusted for missing LD_LIBRARY_PATH var
commit 210397baca401a5ba724f4e945c8efdf15a120e6
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 20:34:21 2018 +0000
added an echo to indicate which compiler is being used.
commit ed6d4687c9f30f58ebde9b1af5823e124628f796
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 20:31:52 2018 +0000
Added configuration to easily choose gcc or clang compilers
commit ce657b4320
Author: CekisSWG <cekisswg@gmail.com>
Date: Fri Dec 28 02:36:09 2018 +0000
Added new ANT build files
commit d66e44c6b9
Author: CekisSWG <cekisswg@gmail.com>
Date: Thu Dec 27 19:00:41 2018 +0000
Updated build script to now use ANT for building.
|
2019-04-19 08:20:38 -07:00 |
|