Commit Graph

84 Commits

Author SHA1 Message Date
932128a084 Replaced printf with correct logger->log call
-  Use of printf breaks the flow of the console
2021-12-13 01:31:39 +00:00
8c6ef98b22 Replaced cout with correct logger->log call
-  Use of cout breaks the flow of the console
2021-12-13 01:29:38 +00:00
d7294bda55 Merge pull request #187 from Nordegraf/fix-nstokenconsole-exchangerate
increased the exchange rate of the nimbus station console to 5 faction tokens for 25 maelstrom infected bricks
2021-12-12 08:44:15 +01:00
834b87f4b2 increased the exchange rate of the nimbus station console to 5 faction tokens for 25 maelstrom infected bricks 2021-12-12 03:45:25 +01:00
180db5dea5 Merge pull request #151 from OogwayUniverse/trigger_fixes
Moonbase fix
2021-12-11 19:39:24 +01:00
95d1c65011 Merge pull request #180 from OogwayUniverse/coin_exploit
Patched coin exploit
2021-12-11 17:40:59 +01:00
bb508e91c1 Update the code style
When applied this commit updates the code style used when validating coin pickups.
2021-12-11 17:33:54 +01:00
94e32a5773 replace the other double cast 2021-12-11 14:24:25 +00:00
6427b097ab Replace two casts with one 2021-12-11 14:22:39 +00:00
22de531ab3 Changes asked for by Wincent 2021-12-11 13:57:15 +00:00
b6453376e4 patched coin exploit 2021-12-11 13:21:00 +00:00
c8991666d2 Potential solution 2021-12-11 10:46:45 +00:00
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
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