Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-15 12:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,284 Commits 147 Branches 5 Tags 384 MiB
2bb39f4fa5
Commit Graph

604 Commits

Author SHA1 Message Date
David Markowitz
c4135eac46
Revert playerflags functions to uint instead of int (#1130) 
Prevents issue with negative numbers resulting in bugs.
 2023-06-26 00:51:28 -07:00
David Markowitz
e32cec6691 Merge branch 'first-draft-leaderboard-re-write' of https://github.com/EmosewaMC/DarkflameServer into first-draft-leaderboard-re-write 2023-06-21 21:53:23 -07:00
David Markowitz
85aa82b4b9 cleanup 2023-06-21 21:53:10 -07:00
David Markowitz
393733cc67
Update GameMessageHandler.cpp 2023-06-21 21:50:54 -07:00
David Markowitz
45256a0338 Merge remote-tracking branch 'upstream/main' into first-draft-leaderboard-re-write 2023-06-21 21:48:22 -07:00
David Markowitz
238fc98ea5 Fix shooting gallery leaderboard bugs 
- add weekly functionality for top scores
- Fix shooting gallery score saving
- remove extra leaderboard fetch
 2023-06-21 21:46:11 -07:00
David Markowitz
d340874284 more bug fixing 
- fix weekly leaderboards
- fix ag classic vs dlu scoring
- fix sorting for survival ns
- fix sorting for racing
 2023-06-21 19:46:01 -07:00
David Markowitz
fe23c7c5f7
Allow default scripts (#1117) 
Fix an issue where vanity script overwrote always
 2023-06-20 10:40:16 -05:00
David Markowitz
132d31d3ab
Fix vehicle serialization during races (#1122) 
* Fix vehicle serialization during races

- Add missing frame stats reading
- correct the inversion of rotation
- correct serialization order
- use proper dirty flags

Tested that racers are no longer sideways on certain vertical slopes and stay in sync throughout the whole race.

* Update ClientPackets.cpp

* Update ClientPackets.cpp

* Update VehiclePhysicsComponent.h
 2023-06-20 09:19:21 -05:00
David Markowitz
2d31b7e4bb
Fix incorrect serialization of SendTeleport (#1121) 
* Fix incorrect serialization of SendTeleport

- Fixes all incorrect teleports in the game
- remove hacks in mast teleport
- ...
- ......

Update GameMessages.cpp

* Remove stupid argument

there got it all out

* remove extra true
 2023-06-18 00:00:36 -07:00
David Markowitz
f46bc33dd4
Fix prereq bug (#1118) 2023-06-17 19:20:05 -05:00
Aaron Kimbrell
1a74c028c2
fix: make vanity npc's use default equipment if none is specified (#1116) 2023-06-16 16:09:46 -05:00
David Markowitz
2a0f63c0a1
Fix all smashables not playing animations (#1112) 
Fixes an issue where most smashables did not explode into bricks upon death.  This included anything that was spawned or didnt have the flag is_smashable set.
Tested that in races, all objects smash into bricks
Tested that the player properly explodes in their car if they crash
Tested that Shooting Gallery plays the special smash animation when a ship is smashed
Tested that all spawned objects play smash animations

* Fix warning, Fix modular assembly not smashing

* Rename variable to correct name
 2023-06-14 15:44:22 -07:00
David Markowitz
12d7ab9034
Remove null check in GetPosition (#1109) 
Get ready for null pointer errors
 2023-06-06 22:48:41 -07:00
EmosewaMC
c99e2a372b Add weekly filter 2023-06-05 16:04:56 -07:00
David Markowitz
259f0c8371 Working in game again 
hooray
 2023-06-05 04:10:59 -07:00
David Markowitz
a5e63529dc const and compile save 2023-06-05 02:50:40 -07:00
David Markowitz
c572f2a58d better tabs and organization 2023-06-05 02:43:02 -07:00
David Markowitz
5bff441c01 Fix query crashing 
Just select all columns since we need most of them anyways
 2023-06-05 02:31:49 -07:00
David Markowitz
96fc6e81d8 Update sql to work 
The old way was supposed to work but doesn't.  Oh well!
 2023-06-05 02:24:00 -07:00
David Markowitz
59d7121978 Merge remote-tracking branch 'upstream/main' into first-draft-leaderboard-re-write 2023-06-05 02:04:14 -07:00
David Markowitz
8ae1e1bc6b
Fix: remove ability to buy items from a vendor if they don't sell said item (#1105) 2023-06-03 00:40:46 -07:00
EmosewaMC
8267823ca4 More simplification 2023-05-31 23:17:13 -07:00
EmosewaMC
b8878da61b Convert to using only floats 
This will cover all of our bases for any type of score.  No need to do any conversions.
 2023-05-31 23:05:19 -07:00
David Markowitz
8a1f275176 add a const 2023-05-31 03:10:28 -07:00
David Markowitz
e1a7b4993e look ma, more work 2023-05-30 18:21:10 -07:00
EmosewaMC
a43e03255c It compiles at least now 2023-05-30 04:38:19 -07:00
EmosewaMC
83da45575e CONST 2023-05-30 04:28:50 -07:00
EmosewaMC
f5f599764d more const and views 2023-05-30 04:23:48 -07:00
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
Aaron Kimbrell
f60ea40acc
Add random end of race behavior (#1056) 
* randominze between 0 and 7 inclusive
for the different animation types

* Make the end behavior deterministic unpon loading
So that all players see the same animations for each other
 2023-04-18 01:40:20 -05:00
EmosewaMC
42870028e4 Remove complex migration 
Only shooting gallery had a value put in the wrong column.  All others were either already correct or unimplemented.
 2023-04-17 15:19:13 -07:00
David Markowitz
fbfa778d3d
Patch ghosting exclusions (#1059) 2023-04-17 14:19:26 -05:00
David Markowitz
fcb088d263 Further work on leaderboards 
- Modularize tests
- Add migrations
- Fix switch case so it actually breaks
- Add in missing writes
- Beginning work on custom migration to move the leaderboard to the final state
 2023-04-17 01:16:23 -07:00
EmosewaMC
ed2639ce4e Use inline functions 2023-04-14 01:32:52 -07:00
David Markowitz
41355cea58 Add remaining enum types 2023-04-13 21:55:09 -07:00
David Markowitz
c91f0d16b3 Get it compiling, add a test and optimize heavily 2023-04-13 00:45:03 -07:00
EmosewaMC
c02963013b first draft 2023-04-12 21:57:58 -07:00
David Markowitz
4734996c7c
Resolve most compiler warnings (#1053) 2023-04-12 11:48:20 -05:00
Aaron Kimbrell
ce51438bc8
Implement some scripts for alpha FV (#1049) 
* Implement maelstrom fog for alpha FV
add OnOffCollisionPhantom call to cppscripts
Add physics shape for gas blocking volume

* Add Ninja Sensie Script for alpha FV
and migration

* Fix private var casing

* And ninja wild scripts
they keep making me add more things

* address feedback

---------

Co-authored-by: Gie "Max" Vanommeslaeghe <gievanom@hotmail.com>
 2023-04-12 11:46:31 -05:00
David Markowitz
308d56968a Use epsilon comparison 2023-04-11 22:25:02 -07:00
David Markowitz
268155fc98
Fix more invisible enemy issues (#1052) 2023-04-11 00:42:12 -07:00
David Markowitz
33f9e9c8cb
Allow case insensitive commands (#1047) 2023-04-08 15:45:45 -05:00
David Markowitz
541250176c
Resolve many issues with invisible enemies and End Behavior nodes not firing (#1044) 
* Finall fix invisible enemies

* Add garbage collection

* Add comment

* Add constexpr for lagFrames
 2023-04-05 08:57:47 -05:00
Gie "Max" Vanommeslaeghe
3202b5a36e
Merge pull request #1042 from EmosewaMC/FixSkills 
Fix SwitchMultiple incorrect handling
 2023-04-03 20:52:22 +02:00
Gie "Max" Vanommeslaeghe
d25b7729b6
Merge pull request #1043 from DarkflameUniverse/update-change-orientation-behavior 
Fix and fully implement ChangeOrientation behavior
 2023-04-03 20:51:39 +02:00
Aaron Kimbre
930735860b use z axis 2023-04-03 13:10:51 -05:00
David Markowitz
426a84daf9
Update InterruptBehavior.cpp 2023-04-03 09:37:29 -07:00
Aaron Kimbre
dffcbcd4d4 cleanup 2023-04-03 08:29:39 -05:00
Aaron Kimbre
a5ff93351d remove empty line 
remove undeeded header
 2023-04-03 08:25:47 -05:00
Aaron Kimbre
1fb086ccbd Fully implement Change orientation 
fix bug where you would always look at self
added to_angle handline
 2023-04-03 08:21:23 -05:00