edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-22 10:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14141 commits 1 branch 424 tags 412 MiB
Commit graph

89 commits

Author SHA1 Message Date
c0d3d3v 7abeaf0cd7
Preparations for the new HUD 
- add pickup sprites to 0.6 data source
- New Enum for the 4 pickup categories
- Remove the unnecessary access to client_data7 for the pickup sprites
- Use the correct sprite set for the HUD sprites
- Read existing weapons into m_Predicted so that this information matches the last snap if the CCharacter is not predicted
- Move m_aWeapons from CCharacter to CCharacterCore for a more consistent data model since it was previously defined twice in the server and client (further so that it can be accessed with m_Predicted)
- Read CNetObj_Character into m_Predicted so that this information matches the last snap if the CCharacter is not predicted.
 2022-04-14 13:38:55 +02:00
Dennis Felsing b96b23d9cb Reset practice when loading team (fixes #4894) 
I hope this doesn't give a chance to cheat. We also reset practice when
killing a team, so loading can be considered as similar to killing?
 2022-03-25 10:09:47 +01:00
c0d3d3v eac2d731b6
Refactoring of g_Config.m_SvTeam, See #4601 2022-02-19 18:11:15 +01:00
Dennis Felsing 18d9997348 Fix clang-format 2022-02-15 00:32:04 +01:00
Dennis Felsing 7da9f1b93b Add modernize-use-equals-delete 2022-02-15 00:20:34 +01:00
Dennis Felsing b58470fda4 Add modernize-use-equals-default 2022-02-15 00:17:57 +01:00
def bcb50c1b29 Enable readability-const-return-type, readability-container-data-pointer, readability-delete-null-pointer 2022-01-22 13:49:14 +01:00
bors[bot] dd9eb0d736
Merge #4584 
4584: Fix rescue tee when swapping (fixes #4578) r=Jupeyy a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
 2022-01-15 18:39:31 +00:00
Wohoo fb09082128 fix another superfluous comma 2022-01-10 20:40:22 +01:00
Wohoo 26372c8164 fixed comma typo 2022-01-10 20:31:43 +01:00
Wohoo 6070a66c99 Save server string corrected. 
Fix typo in comments
 2022-01-10 19:23:48 +01:00
def c99433a800 Fix rescue tee when swapping (fixes #4578) 2022-01-09 22:13:27 +01:00
Wohoo ea98120bb2 Save is now back compatible with older version (default m_LiveFreeze=0). 
Fix clang-format on comments
 2022-01-09 18:39:46 +01:00
Wohoo 2017464282 Livefreeze implementation with CHARACTERFLAG_NO_MOVEMENTS flag. 
Freeze and Unfreeze tiles added to switch layer too.
 2022-01-07 16:53:40 +01:00
def 2e34f45c50 Don't access switchers out of bounds (fixes #4386) 
It's possible that a map was saved with a different amount of switchers
than it has at the moment. Happened on Jao Shooter. I'll check with
mapper if they changed the number of switchers.
 2021-11-23 19:01:52 +01:00
ChillerDragon 5140854d68 Some char array naming convention 2021-09-13 12:21:56 +02:00
Edgar d7107da2f1
Fix swap resets switches. 
Fixes #3806
 2021-08-21 10:02:45 +02:00
heinrich5991 8b2c5949e4 Fix save codes (symptom: always jumping after load) 
"\t" was missing for one variable.
 2021-07-23 01:17:06 +02:00
heinrich5991 4c2bd53e9b /save each tee's starting state 
Part of fixing start line skipping.
 2021-07-21 17:54:46 +02:00
Kyle Bradley decaeb8934 PR feedback: 
- Changed names of variables
- Changed config descriptions
- Fix for perma timeout
 2021-03-20 18:08:54 +02:00
Kyle Bradley 73aea2426b Style fixes 2021-03-17 00:33:48 +02:00
Kyle Bradley 4afe62a596 Updated to include penalty, cooldown and timeout 2021-03-17 00:31:16 +02:00
Zwelf 9daf1274a4 Rename save/load to conform to the code style 2021-02-16 18:15:50 +01:00
Zwelf a3702e8314 Inform player about possibility to keep the hook when loading 
Message is displayed when saving with an active hook
 2021-01-23 16:49:50 +01:00
Alexander Akulich e34f268bed Make CSaveTee and CPlayer not friends anymore 2021-01-16 03:20:57 +03:00
Alexander Akulich f16937b361 gamecontext.h: Remove unused player.h include 
See the upstream commit 24bda2faa0
 2021-01-10 14:25:12 +03:00
Alexander Akulich 164cb9907a player.h: Remove unused character.h include 
See the upstream commit 24bda2faa0
 2021-01-10 14:25:12 +03:00
Zwelf 72455ed32d Fix use of uninitialized variable during /load of old saves 2020-12-28 18:02:43 +01:00
Zwelf 81131c7831 Fix grammar mistake 2020-10-19 15:23:48 +02:00
Zwelf 6d11c34d63 Load game UUID on /load 
Fixes #2522 and #3144
 2020-10-19 15:21:23 +02:00
def 3be8a592e5 Run clang-format 
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:

$ python scripts/fix_style.py
 2020-09-26 21:50:15 +02:00
Zwelf 52af88826c Allow switching weak/strong with saving and loading 2020-08-13 16:19:07 +02:00
Zwelf 5b53a05a40 Rename LoadString to FromString to fix windows build 2020-08-09 17:14:11 +02:00
Zwelf 17bb4522fc Fix erroneous "unable to find all characters" message 2020-07-02 16:34:36 +02:00
Zwelf 9e43f8d483 Add CCharacter::m_ReloadTimer to save 2020-06-30 23:49:40 +02:00
Zwelf 839fd08d6a Check if player still in team when loading hook 2020-06-30 20:13:45 +02:00
Zwelf 7427e41959 Keep hook when loading 2020-06-30 18:09:26 +02:00
Zwelf f2b5abb1fb Keep weak/strong when reloading 2020-06-30 17:52:55 +02:00
Zwelf 949d710597 Fix wrong indention 2020-06-30 17:52:55 +02:00
Zwelf c9f8cc99b1 Stop searching when player was found 2020-06-30 17:52:55 +02:00
def 3530d0ae32 Set rescue tee immediately after loading (fixes #2248) 2020-06-24 21:19:46 +02:00
def 252cda2d49 Use str_comp instead of strcmp 
error: ‘strcmp’ was not declared in this scope
 2020-06-22 14:47:49 +02:00
Zwelf e9242f45f1 Thread safe /load 2020-06-15 11:14:15 +02:00
Zwelf 031ac52320 Thread safe /save 2020-06-15 11:14:15 +02:00
Zwelf 0891a0fd51 Remove some unnecessary header includes 2020-06-15 10:59:59 +02:00
Zwelf 7146eb572b Save error handling clean up 2020-06-15 10:59:46 +02:00
def e1849ad1bb Implement /practice for teams 
As discussed on Discord today, can be enabled inside of teams on the fly
during each run on any server. Finishes don't count. I haven't tested
save/load yet, would do that live on the server if this can be merged.
 2020-05-27 17:33:26 +02:00
Zwelf fab1cde94e Rename variables for consistency 
The following member variables:

* m_name to m_aName
* m_String to m_aString
* m_CpCurrent to m_aCpCurrent
* m_Switchers to m_pSwitchers
* SavedTees to m_pSavedTees
 2020-05-26 21:49:58 +02:00
Zwelf 8bdf41c1b5 Break save/load string into multiple lines 2020-05-21 18:04:15 +02:00
Zwelf 61787168a6 Rename aGameUuid to m_aGameUuid for consistency 2020-05-20 22:22:02 +02:00