Commit Graph

58 Commits

Author SHA1 Message Date
Mick Vermeulen
f22bf24663 Update BaseEnemyMech script to change the default faction
As part of the base enemy mech script its faction should be updated to 4
to make sure it's seen as an enemy by the client. The AgDarklingMech script
has been deleted as its functionality was essentially that of BaseEnemyMech
and thus no longer necessary.
2021-12-08 20:00:08 +01:00
Avery
a923a2baa7 Merge pull request #116 from DarkflameUniverse/revert-83-main
Revert "separate AgSpaceStuff and AgShipShake"
2021-12-07 18:14:26 -08:00
Avery
f68f683e22 Revert "separate AgSpaceStuff and AgShipShake" 2021-12-07 18:14:15 -08:00
Mick
5281253f66 Merge pull request #83 from red031000/main
separate AgSpaceStuff and AgShipShake
2021-12-07 21:53:42 +01:00
red031000
7bead89e39 fix a bug with timer erasing 2021-12-07 20:50:09 +00:00
red031000
002f3b6c0e separate AgSpaceStuff and AgShipShake 2021-12-07 20:50:09 +00:00
Mick
a873de5e9e Merge pull request #68 from Ramen2X/main
Make 0_initial.sql compatible with MySQL
2021-12-07 21:48:44 +01:00
Wincent Holm
73ef2e6c59 Merge pull request #91 from JoachimFlottorp/FixChat
Pull Request to fix chat messages
2021-12-07 21:35:55 +01:00
wincent
e967bf2398 Updated solution 2021-12-07 21:03:55 +01:00
TomNordesen
eede772b53 Nice Commit! :) 2021-12-07 20:43:42 +01:00
TomNordesen
bcb0454916 fixed 2021-12-07 20:38:05 +01:00
TomNordesen
d2fe15679c Nice Commit! :) 2021-12-07 20:35:12 +01:00
TomNordesen
c48f4b08a2 Nice Commit! :) 2021-12-07 20:19:47 +01:00
TomNordesen
bfcce19649 Nice Commit! :) 2021-12-07 19:58:24 +01:00
Avery
0db954fa72 Update README.md 2021-12-07 12:15:57 -05:00
Gie "Max" Vanommeslaeghe
6e33f5e545 Merge pull request #88 from OogwayUniverse/windows
Windows fixes (needs proper ZCompresion fix in the future)
2021-12-07 17:30:37 +01:00
Gie "Max" Vanommeslaeghe
eab32c68f3 Update CONTRIBUTING.md 2021-12-07 16:36:38 +01:00
TomNordesen
fe5814d5ba Nice Commit! :) 2021-12-07 16:31:53 +01:00
Jett
393cce885b Windows fixes
- "Fixed" segfault
- Fixed logger not actually logging time
2021-12-07 11:12:29 +00:00
Mick
b580f19825 Merge pull request #2 from StefanH-AT/readme-cmake-version
Add note to readme about cmake version to build
2021-12-07 10:22:26 +01:00
Avery
17e4f2536b Merge pull request #85 from DarkflameUniverse/revert-44-patch/zone_path_casing
Revert "Try to load from original zone path before a lowercased one"
2021-12-07 00:25:33 -08:00
Avery
595afc4a93 Revert "Try to load from original zone path before a lowercased one" 2021-12-07 00:25:19 -08:00
Ramen2X
ca287db536 make 0_initial.sql compatible with MySQL 2021-12-06 20:06:12 -05:00
Gie "Max" Vanommeslaeghe
994382b801 Merge pull request #43 from TheLongestRose/patch-1
Important note for WSL2 users
2021-12-06 23:08:41 +01:00
Wincent Holm
d9348054f1 Merge pull request #15 from Arkannex/patch-1
Update NPC.xml
2021-12-06 15:06:34 +01:00
Arkannex
713cb6c6e5 Update NPC.xml 2021-12-06 08:04:19 -06:00
Wincent Holm
d7b443d51b Merge pull request #13 from JoachimFlottorp/main
Modified README specifying CMakeVariables outside the Python box
2021-12-06 15:01:22 +01:00
Wincent Holm
af05371c09 Merge pull request #44 from yuwui/patch/zone_path_casing
Try to load from original zone path before a lowercased one
2021-12-06 14:58:34 +01:00
Wincent Holm
9dc38e87cd Merge pull request #11 from yuwui/patch/default_net_version
change default network version to unmodded client
2021-12-06 14:53:23 +01:00
yuwui
932bf7ca60 update readme 2021-12-06 12:29:42 +01:00
yuwui
2dd96198af try original zone path before lowercasing 2021-12-06 10:31:09 +01:00
TheLongestRose
7dadc4ce77 Important note for WSL2 users
The server and client cannot connect when the server is running on a WSL2 distro and the server is set to localhost, due to differences between WSL1 and 2. This won't affect most people, but would have saved me a few hours.
2021-12-06 00:04:52 -08:00
Wincent Holm
34f1d4002b Merge pull request #38 from yuwui/patch/strip_cr 2021-12-06 07:46:14 +01:00
yuwui
3845dc77f9 strip carriage return from txt files 2021-12-06 07:07:17 +01:00
Wincent Holm
3163c91a4a Merge pull request #34 from aronwk-aaron/patch-1 2021-12-06 06:39:28 +01:00
Avery
7e4be6fdb6 Update README.md 2021-12-06 00:39:13 -05:00
Avery
4b8712b0f5 Update README.md 2021-12-06 00:37:30 -05:00
Aaron Kimbrell
2f064f0145 change repo url in worldconfig.ini to be correct 2021-12-05 22:37:32 -06:00
Avery
0a9d4d0d66 Update 0_nt_footrace.sql 2021-12-05 19:28:06 -08:00
Avery
bcfa1fb906 Update 1_fix_overbuild_mission.sql 2021-12-05 19:27:45 -08:00
Avery
3c3a3dba8f Merge pull request #17 from m888r/clangfix
Small fixes for windows clang compile
2021-12-05 19:09:47 -05:00
Manas Shah
f760ef456c Small fixes for windows clang compile 2021-12-05 15:59:50 -08:00
Arkannex
1ba48ecd64 Update NPC.xml
Addition of an NPC to Gnarled Forest near Bucky Urchin.
2021-12-05 17:43:38 -06:00
JoachimF
0c006b4007 Update README.md 2021-12-05 23:50:30 +01:00
Gie "Max" Vanommeslaeghe
498a9c0be4 Merge pull request #3 from luxaritas/patch-1
Note that the zlib -dev package is needed
2021-12-05 23:25:14 +01:00
yuwui
26dd78fff7 change default network version to 171022 2021-12-05 23:16:12 +01:00
Wincent Holm
54810fd5ef Added names to folder to copy over to build/res 2021-12-05 22:11:09 +01:00
Gie "Max" Vanommeslaeghe
27dace206b Merge pull request #6 from XenoTrixx/main
Corrected apt install command for ubuntu
2021-12-05 22:01:39 +01:00
XenoTrixx
a54687671a Correctet apt install command for ubuntu 2021-12-05 21:48:43 +01:00
Jonathan Romano
e0ef02bfdb Note that the zlib -dev package is needed 2021-12-05 15:31:42 -05:00