Commit Graph

123 Commits

Author SHA1 Message Date
e31dc35733 Merge pull request #170 from OogwayUniverse/minifig_editing 2021-12-11 10:50:44 +01:00
5767ebea38 Merge pull request #132 from StefanH-AT/readme-note-delete-script-pak 2021-12-11 10:48:26 +01:00
6500b62c52 Minifig editing 2021-12-11 02:02:02 +00:00
a9dc0e0dac to improve (broken) 2021-12-09 21:06:01 +00:00
82a1c8a765 Merge pull request #147 from Daystar1998/main
Fix spelling
2021-12-09 18:20:41 +01:00
1f083cb168 Merge pull request #136 from MickVermeulen/main
Add issue templates
2021-12-09 18:18:24 +01:00
51600a5329 Merge pull request #134 from DarkflameUniverse/fix-sentry-faction
Update BaseEnemyMech script to change the default faction
2021-12-09 18:17:55 +01:00
140c736bef Merge pull request #130 from DarkflameUniverse/contributing-commit-guidelines
Update CONTRIBUTING.md to include commit guidelines
2021-12-09 18:17:41 +01:00
9b085faf07 Add issue templates
Added issue templates to aid with the structural submission of issues.
2021-12-09 18:17:19 +01:00
e4de42659e Update Entity.cpp 2021-12-09 13:56:07 +00:00
bd609dfc90 Add ship shake to not log about being missing
This log was causing confusion and issues when in reality there was no problem present.
2021-12-09 13:09:12 +00:00
50512cdef8 Fix spelling 2021-12-09 03:17:08 -06:00
8c16127115 Fix spelling 2021-12-08 23:31:58 -06:00
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
fdd4e3cc80 Add note to readme for troubleshooting tips with script editing 2021-12-08 18:22:05 +01:00
e91222b504 Update CONTRIBUTING.md to include commit guidelines
Added commit guidelines to CONTRIBUTING.md to aid people in writing proper
commits.
2021-12-08 18:11:12 +01:00
a923a2baa7 Merge pull request #116 from DarkflameUniverse/revert-83-main
Revert "separate AgSpaceStuff and AgShipShake"
2021-12-07 18:14:26 -08:00
f68f683e22 Revert "separate AgSpaceStuff and AgShipShake" 2021-12-07 18:14:15 -08:00
5281253f66 Merge pull request #83 from red031000/main
separate AgSpaceStuff and AgShipShake
2021-12-07 21:53:42 +01:00
7bead89e39 fix a bug with timer erasing 2021-12-07 20:50:09 +00:00
002f3b6c0e separate AgSpaceStuff and AgShipShake 2021-12-07 20:50:09 +00:00
a873de5e9e Merge pull request #68 from Ramen2X/main
Make 0_initial.sql compatible with MySQL
2021-12-07 21:48:44 +01:00
73ef2e6c59 Merge pull request #91 from JoachimFlottorp/FixChat
Pull Request to fix chat messages
2021-12-07 21:35:55 +01:00
e967bf2398 Updated solution 2021-12-07 21:03:55 +01:00
eede772b53 Nice Commit! :) 2021-12-07 20:43:42 +01:00
bcb0454916 fixed 2021-12-07 20:38:05 +01:00
d2fe15679c Nice Commit! :) 2021-12-07 20:35:12 +01:00
c48f4b08a2 Nice Commit! :) 2021-12-07 20:19:47 +01:00
bfcce19649 Nice Commit! :) 2021-12-07 19:58:24 +01:00
0db954fa72 Update README.md 2021-12-07 12:15:57 -05:00
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
eab32c68f3 Update CONTRIBUTING.md 2021-12-07 16:36:38 +01:00
fe5814d5ba Nice Commit! :) 2021-12-07 16:31:53 +01:00
393cce885b Windows fixes
- "Fixed" segfault
- Fixed logger not actually logging time
2021-12-07 11:12:29 +00:00
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
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
595afc4a93 Revert "Try to load from original zone path before a lowercased one" 2021-12-07 00:25:19 -08:00
ca287db536 make 0_initial.sql compatible with MySQL 2021-12-06 20:06:12 -05:00
994382b801 Merge pull request #43 from TheLongestRose/patch-1
Important note for WSL2 users
2021-12-06 23:08:41 +01:00
d9348054f1 Merge pull request #15 from Arkannex/patch-1
Update NPC.xml
2021-12-06 15:06:34 +01:00
713cb6c6e5 Update NPC.xml 2021-12-06 08:04:19 -06:00
d7b443d51b Merge pull request #13 from JoachimFlottorp/main
Modified README specifying CMakeVariables outside the Python box
2021-12-06 15:01:22 +01:00
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
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
932bf7ca60 update readme 2021-12-06 12:29:42 +01:00
2dd96198af try original zone path before lowercasing 2021-12-06 10:31:09 +01:00
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
34f1d4002b Merge pull request #38 from yuwui/patch/strip_cr 2021-12-06 07:46:14 +01:00
3845dc77f9 strip carriage return from txt files 2021-12-06 07:07:17 +01:00
3163c91a4a Merge pull request #34 from aronwk-aaron/patch-1 2021-12-06 06:39:28 +01:00