Commit Graph

1645 Commits

Author SHA1 Message Date
Nils Bergmann
0bf03cb66e
Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:57:53 +01:00
Jett
f15b716ea7 Implement master server fix 2021-12-31 02:52:35 +00:00
Marcono1234
7c1f392fdf Fix initial character XML being malformed
XML was missing a space between attributes `lzrw` and `stt`.
2021-12-30 19:42:59 +01:00
Kay Kaprolat
0a737eaa0d
Add note about client files and linux performance 2021-12-30 19:35:06 +01:00
Kay Kaprolat
64edb88d36
Changed docker-compose to docker compose 2021-12-30 19:21:53 +01:00
Kay Kaprolat
1e7a2febea
Fix Docker Desktop download link 2021-12-30 19:19:27 +01:00
Kay Kaprolat
da0be9f226
Clarify alt-text of step 7 2021-12-30 17:13:37 +01:00
Kay Kaprolat
8af1c92eff
Fix typo in step 7 2021-12-30 17:13:07 +01:00
Kay Kaprolat
be008ca439
Indent all images 2021-12-30 17:11:25 +01:00
cooltrain7
6e6eee71b3 Added more missing newline characters 2021-12-28 19:27:46 +00:00
Raphaël Dunant
2ac2dbd650
Update UserManager.cpp
Style fix (CamelCase and space)
2021-12-28 19:56:49 +01:00
cooltrain7
ff8d68f45c Merge branch 'main' into Log-Line-Cleaning 2021-12-28 18:46:44 +00:00
Gie "Max" Vanommeslaeghe
0a7d9c46eb
Merge pull request #304 from OogwayUniverse/team_loot_repairs
Team loot fixes
2021-12-26 16:18:23 +01:00
Racater
b6fc49f057 simplify shirt code in character creation 2021-12-26 14:45:21 +01:00
Raphaël Dunant
57e28d4619
Merge branch 'DarkflameUniverse:main' into main 2021-12-26 14:42:16 +01:00
Nils Bergmann
8ba3fe33f3
Merge branch 'DarkflameUniverse:main' into main 2021-12-25 17:05:37 +01:00
Jett
76c9d057cf Update ChatPacketHandler.cpp 2021-12-24 11:57:31 +00:00
EmosewaMC
5e605b30de Grammatical change in a comment
Small grammatical change in a comment
2021-12-23 19:50:17 -08:00
EmosewaMC
e95af79c8a Consolidated if statement
Changed default variable to achievement and removed the else.
2021-12-23 19:43:19 -08:00
EmosewaMC
e84811bdce Refactored if statement for coins
Refactored the if statement for coins so there is only one SetCoins call for the function.
2021-12-23 18:49:01 -08:00
EmosewaMC
6aad799f95 Updated variable names
Updated the variable names to match the enum name update.
2021-12-23 18:48:08 -08:00
EmosewaMC
6ff5ae78aa Corrected enum name
Corrected the enum name and prefixes of the elements in the enum.
2021-12-23 18:46:21 -08:00
Jett
7d40585211 Test frakjaw fix 2021-12-24 01:14:15 +00:00
Jett
9440af0d67 Repaired some bugs
- Fixed Team loot
- LMI dropping for team sizes
- No more > 4 player teams
2021-12-24 00:25:52 +00:00
Wincent Holm
0afba0d1d3
Merge pull request #294 from DarkflameUniverse/fix-loot-crash 2021-12-22 17:55:53 +01:00
Wincent Holm
271e14e2f1
Fix loot crash
When applied this commit fixes a crash with the loot system due to a missing nullptr check.
2021-12-22 17:16:31 +01:00
Raphaël Dunant
ac01edd440
Fix wrong shirt colors in the character selection 2021-12-22 16:02:19 +01:00
EmosewaMC
f772fedf19 Updated description of SetCoins
Updated the description of the Character::SetCoins function to more accurately describe how the function works.
2021-12-22 00:43:42 -08:00
EmosewaMC
29cf7f8998 Changed ambiguous variables
Changed ambiguous variables from int to int32_t to clarify what they are.
2021-12-22 00:15:08 -08:00
EmosewaMC
97f8e9e9fc Added enum for coin sources
Added an enum for coin sources as to avoid leaving a random number in the code.
2021-12-22 00:01:55 -08:00
EmosewaMC
c575294587 Changed variable names
Changed variable names to more accurately match what they are
2021-12-21 23:32:39 -08:00
EmosewaMC
23e269940b Implemented sourceType for SendSetCurrency
Implemented sourceType for the function SendSetCurrency.
2021-12-21 23:26:54 -08:00
Verathian
7b18c81608 BoNS Time Smash Fix 2021-12-22 00:20:53 -05:00
Verathian
eae1a38705 Portal Stun Time Reductions 2021-12-21 22:51:38 -05:00
Verathian
3cb16ddb5f Leaderboard Scoring Updates 2021-12-21 22:30:37 -05:00
Verathian
dcbca46e75 Leaderboard Scoring Updates 2021-12-21 22:15:29 -05:00
Wincent Holm
65b7f49c9b
Merge pull request #248 from Xiphoseer/main 2021-12-21 21:23:56 +01:00
Gie "Max" Vanommeslaeghe
1006bd17e3
Merge pull request #276 from cuzitsjonny/main
ChatServer respawn after crash
2021-12-21 20:09:16 +01:00
Wincent Holm
0700b9647b
Merge pull request #284 from saltshaker/main 2021-12-21 11:23:26 +01:00
saltshaker
aad4ed6a83 Added include <vector> to Loot.h to allow the server to build on GCP. Resolves #281. 2021-12-21 03:17:35 -07:00
Nils Bergmann
185bed2048
Merge pull request #7 from VBMCBoy/readme-improvements 2021-12-20 14:07:04 +01:00
Jonny
9d52ee7120 WorldServer now attempts to reconnect to ChatServer 2021-12-20 13:50:53 +01:00
Jett
0531365cb5
Make loot accurate to the loot drop rates during live. (#216)
* loot fix (broken)

* Fixed loot

* Update SlashCommandHandler.cpp

* Remove debug command

* Roll loot command

* Remove debug log

* Added const references
When this commit is applied it adds const references to the loot system avoid some unnecessary copies.

Co-authored-by: wincent <wincent.holm@gmail.com>
Co-authored-by: Avery <averysumner@gmail.com>
2021-12-20 02:25:45 -08:00
Avery
f7858ab183
Merge pull request #222 from anarcal/main
Add port recycling to instance creation
2021-12-20 01:47:23 -08:00
Jonny
dfb41c7c40 MasterServer now respawns ChatServer on crash 2021-12-20 10:08:57 +01:00
Wincent Holm
c8177563e9 Fix non-standard lambda.
When this commit is applied it fixes use of non-standard lambda.
2021-12-19 14:47:03 +01:00
Wincent Holm
6f6be5ec47 Remove utils module adde in PR by mistake 2021-12-19 13:48:31 +01:00
Wincent Holm
54501bce2a
Merge pull request #258 from Nordegraf/fix-wreckin-it 2021-12-19 12:49:14 +01:00
Wincent Holm
46149b19f1
Merge pull request #254 from EmosewaMC/Crux-Prime-Enemy-Fix 2021-12-19 08:43:24 +01:00
EmosewaMC
35e8a374df Required script functions added
Re-added the required script functions.
2021-12-18 00:22:49 -08:00