Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 13:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,165 Commits 141 Branches 5 Tags 385 MiB
7b1626901a
Commit Graph

525 Commits

Author SHA1 Message Date
EmosewaMC
7b1626901a Add some debug asserts 2023-05-30 04:18:32 -07:00
EmosewaMC
a595347211 Merge remote-tracking branch 'upstream/main' into first-draft-leaderboard-re-write 2023-05-30 04:11:53 -07:00
EmosewaMC
0107d05d55 draft 2023-05-30 04:11:37 -07:00
David Markowitz
f26e66da4d small updates to typs 2023-05-28 04:30:20 -07:00
David Markowitz
1f3df08730 Update GameMessages.cpp 2023-05-13 16:22:13 -07:00
David Markowitz
8a065ad074 Merge remote-tracking branch 'upstream/main' into more-cdclient-cleanup 2023-05-13 16:16:58 -07:00
David Markowitz
4fe335cc66
Refactor: Amf3 implementation (#998) 
* Update AMFDeserializeTests.cpp

Redo Amf3 functionality

Overhaul the whole thing due to it being outdated and clunky to use

Sometimes you want to keep the value

Update AMFDeserializeTests.cpp

* Fix enum and constructors

Correct enum to a class and simplify names.
Add a proper default constructor

* Update MasterServer.cpp

* Fix bugs and add more tests

* Refactor: AMF with templates in mind

- Remove hard coded bodge
- Use templates and generics to allow for much looser typing and strengthened implementation
- Move code into header only implementation for portability

Refactor: Convert AMF implementation to templates

- Rip out previous implementation
- Remove all extraneous terminology
- Add proper overloads for all types of inserts
- Fix up tests and codebase

* Fix compiler errors

* Check for null first

* Add specialization for const char*

* Update tests for new template specialization

* Switch BitStream to use references

* Rename files

* Check enum bounds on deserialize

I did this on a phone
 2023-05-13 17:22:00 -05:00
Aaron Kimbrell
9d105a287d
fix: not everything attached to a path is a moving platform (#1090) 2023-05-13 13:47:28 -07:00
Aaron Kimbrell
739eae5244
feature: Implement FallSpeedBehavior (#1084) 
* Hacky FallSpeedBehavior

* Fixup

* Make it more robust like speedboost
add check for default
Fix error in GetActiveSpeedboosts

* simplify and address feedback
 2023-05-13 09:30:59 -05:00
Gie "Max" Vanommeslaeghe
07803a7ca2
Merge pull request #1085 from DarkflameUniverse/issue-436 
fix: not exiting shooting gallery when clicking activity close button
 2023-05-13 14:11:16 +02:00
Gie "Max" Vanommeslaeghe
61ae619886
Merge pull request #1032 from EmosewaMC/FixWingreaper 
Fix Wingreaper birds not moving
 2023-05-13 14:04:37 +02:00
David Markowitz
c5afd7d4a3 Fix deserialization errors for MovingPlatforms 
- Fixes deserialization errors for MovingPlatforms that did not have an attached_path, but had a MovingPlatform component >= id 0.
 2023-05-13 04:04:15 -07:00
Aaron Kimbre
a809f36548 Address feedback 2023-05-11 09:23:48 -05:00
Aaron Kimbrell
6e6a05fc1d
fix: prevent negative imagination (#1083) 
* fix: prevent negative imagination
And fail switch if we don't have enough imagination

* Make better
 2023-05-11 06:37:02 -05:00
Aaron Kimbre
5af5b0f1c1 fix: not exiting shooting gallery when clicking activity close button 
Fixes #436
Fixes crash when replaying as well
 2023-05-10 19:26:04 -05:00
Aaron Kimbrell
bf0ae6f181
fix: add check for arg nums on handlepushobject (#1081) 2023-05-10 07:44:21 -05:00
Aaron Kimbrell
b1cd2776fa
fix: make exiting the race work (#1082) 2023-05-10 04:05:56 -05:00
David Markowitz
af1abe9e74 Use only ints 2023-05-10 01:32:55 -07:00
David Markowitz
4dba8d9225 Correct column order 2023-05-09 22:21:41 -07:00
David Markowitz
3448426caf commit 2023-05-09 22:00:13 -07:00
David Markowitz
7a067e7b48 Working in game! 
- Add score saving for races
- Fix some bugs
- Still work to do.
 2023-05-09 01:42:11 -07:00
David Markowitz
411c9eaf1f Remove dead code 2023-05-09 00:06:43 -07:00
Aaron Kimbrell
4ff5afd9f7
Fix race exit dialogue always exiting (#1077) 
Fixes #1048
Tested that closing the dialog via esc, the x in the top right, or the big red x doesn't exit the race
Tested that the green check button does exit the race
 2023-05-09 00:40:00 -05:00
EmosewaMC
6c2312fe87 Implement page fetching 2023-05-08 19:59:10 -07:00
EmosewaMC
d98ad4b94f Implement leaderboard page offsets 2023-05-08 19:35:19 -07:00
EmosewaMC
5c086909ed Ready for implementation 2023-05-08 18:36:28 -07:00
David Markowitz
1c7ac93d4b Fix various bugs and make code cleaner. 
Still have work to go.
 2023-05-08 03:55:10 -07:00
Gie "Max" Vanommeslaeghe
64a947e338
Merge pull request #1069 from EmosewaMC/NullChecks 
Add more null checks and split out code
 2023-05-08 12:10:58 +02:00
David Markowitz
0f307ac4be Fix bugs 
- Reinforce Query formatting
- Guarantee 11 rows are selected at a time by ranking by id, should there be more than an 11 way tie.
 2023-05-08 02:46:55 -07:00
Aaron Kimbrell
8ceabadcde
Removed some hardcoded logic for racing (#1075) 
Including return world and what activity ID to use for rewards
 2023-05-08 04:38:08 -05:00
David Markowitz
bc518be654 Bug fixes and cleanup 
Fix co-pilot induced column bugs
Fix insert/update statements
Added saving functionality
Added update clause for column
 2023-05-07 04:09:10 -07:00
EmosewaMC
820b375c50 push 2023-05-07 00:31:38 -07:00
David Markowitz
cffb1449d8
Add better logs to saving (#1068) 
* Fix overread in projectile behavior

* Fix stuns

* Correctly read in bitStream

* Fix projectile behavior

* Address movement type issues

* Update shutdown time to be accurate

* Fix small issues

* Fix missing template

* Add note for compile jobs

* Add bounds check for speed division

* Add better logs
 2023-05-06 13:32:38 -05:00
David Markowitz
df3265c82e Add more null checks and split out code 
Makes crash logs more apparent for what stage they crashed in for the engine updating.
 2023-05-05 23:31:30 -07:00
David Markowitz
3b8f18d2be Fix new lines 2023-05-05 21:33:30 -07:00
EmosewaMC
0faef7d791 Finished saving 2023-05-04 16:53:36 -07:00
EmosewaMC
28a0492201 Fix bugs 2023-05-04 14:48:26 -07:00
EmosewaMC
2ab995b9c3 Simplify snprintfs 
so much better to read
 2023-05-04 14:28:53 -07:00
EmosewaMC
8de528e77c Remove old code 2023-05-04 13:58:48 -07:00
Aaron Kimbrell
e297aacc68
Breakout message identifiers (#1065) 
and make them scope enums
 2023-05-03 16:38:32 -05:00
David Markowitz
a3626a3b53 The query is supposed to get SMALLER 
Still better than 9 different queries all with 1 minor change i guess.
 2023-05-03 00:38:38 -07:00
Aaron Kimbrell
c17b5fa586
prevent ressurecting with more than max stats (#1064) 
for health and imagination
 2023-05-03 01:31:50 -05:00
David Markowitz
b5e3bd22e3 Merge remote-tracking branch 'upstream/main' into first-draft-leaderboard-re-write 2023-05-02 15:49:23 -07:00
Aaron Kimbrell
6aa90ad5b2
Breakout rest of the enums from dCommonVars and clean it up (#1061) 
* Breakout rest of the enums from dcommonvars
so we don't have to deal with merge conflicts
ePlayerFlags is not a scoped enum, yet, due to it's complexity

* address feedback

* make player flag types consistent

* fix typo
 2023-05-02 17:39:21 -05:00
EmosewaMC
48264e2cf4 push 2023-04-30 21:30:41 -07:00
David Markowitz
10a2c24d5e Add base MyStandings query 2023-04-26 02:10:57 -07:00
Aaron Kimbrell
4976701f37
breakout object bits into scoped enum (#997) 
* breakout object bits into enum class
tested that things still work as expected
use the inplace set bits where appropiate

* add inline
 2023-04-25 13:17:40 -05:00
Gie "Max" Vanommeslaeghe
de1ddd3125
Merge pull request #1019 from EmosewaMC/inventoryTypeCorrections 
Correct incorrect inventory types
 2023-04-23 12:49:43 +02:00
Aaron Kimbrell
2e284eb2ce
Implement Timer handlers in triggers and ontimerdone trigger event (#1031) 
* Works, but AOE is broken

* Address Feedback

* fix typo
 2023-04-18 12:48:03 -05:00
EmosewaMC
89f427ace0 Further work on leaderboards 2023-04-18 01:26:35 -07:00