wincent
c948e4bb84
Update to new apis
2024-09-08 17:54:43 +02:00
wincent
3efad8aa50
Merge remote-tracking branch 'origin/main' into dCinema
2024-09-08 17:43:20 +02:00
David Markowitz
94b9731a2b
Use the correct bit field for checking whether or not to decrement progress ( #1631 )
...
Tested that the cooking mission with johnny umami now no longer allows you to lose progress by deleting items.
2024-08-11 10:26:25 -07:00
David Markowitz
aaf446fe6e
feat: Add Inventory Brick and Model groups ( #1587 )
...
* Added feature grouping logic
* Add saving of brick buckets
* Add edge case check for max group count
* Use vector for storing groups
* Update InventoryComponent.cpp
* Update InventoryComponent.h
* Update InventoryComponent.h
* fix string log format
* Update GameMessages.cpp
2024-08-01 23:38:21 -07:00
Gie "Max" Vanommeslaeghe
2c70f1503c
Merge pull request #1616 from DarkflameUniverse/behavior
...
fix: add larger behavior fields for saving
2024-07-17 22:24:52 +02:00
Gie "Max" Vanommeslaeghe
49b4748ed3
Merge pull request #1614 from DarkflameUniverse/tea
...
fix: move mission progression location for racing
2024-07-17 22:24:17 +02:00
Gie "Max" Vanommeslaeghe
ffeb0108d0
Merge pull request #1619 from DarkflameUniverse/shield
...
fix: echo skill cast down to client for some server skills
2024-07-17 22:23:21 +02:00
David Markowitz
c3f6ef5a1d
feat: add admin account creation options from cli (GM level) ( #1620 )
...
* add admin account creation options from cli
* use actual gm levels
felt under delivered in previous iteration.
* Update dMasterServer/MasterServer.cpp
Co-authored-by: Daniel Seiler <me@xiphoseer.de>
---------
Co-authored-by: Daniel Seiler <me@xiphoseer.de>
2024-07-03 15:37:19 -07:00
David Markowitz
999995b2fb
Merge branch 'main' into shield
2024-07-02 03:14:32 -07:00
Gie "Max" Vanommeslaeghe
84fff7c380
Merge pull request #1621 from DarkflameUniverse/EmosewaMC-patch-10
...
fix: compiler issue on newer gcc versions
2024-07-02 12:12:30 +02:00
David Markowitz
59c4b35479
Update Preconditions.cpp
2024-07-02 01:55:42 -07:00
David Markowitz
f2d72e7ed5
Update Preconditions.cpp
2024-06-25 21:02:40 -07:00
David Markowitz
b648b43c4d
??
2024-06-25 20:52:46 -07:00
David Markowitz
2628470482
set shield to false, add sync for done
2024-06-18 14:24:03 -07:00
David Markowitz
f82a82f254
Create 16_big_behaviors.sql
2024-06-17 19:41:27 -07:00
Gie "Max" Vanommeslaeghe
9400ee1dc0
Merge pull request #1586 from DarkflameUniverse/property_behavior_saving
...
feat: Property Behavior Saving
2024-06-16 12:31:21 +02:00
David Markowitz
54b8c25754
Merge branch 'main' into tea
2024-06-12 19:20:44 -07:00
David Markowitz
b984cd6a0b
Merge branch 'main' into property_behavior_saving
2024-06-12 19:17:39 -07:00
Gie "Max" Vanommeslaeghe
bcf1058759
Merge pull request #1595 from DarkflameUniverse/issue-462
...
fix: prevent moving items between inventories under cetain circumsances
2024-06-11 20:48:09 +02:00
David Markowitz
6ad6e930c7
move mission progression
...
done now as soon as you cross the finish line on the last lap instead of after you click "rewards"
2024-06-11 02:29:25 -07:00
David Markowitz
fee0238e79
fix: master not using table data, remove 2 noisy logs ( #1613 )
...
Tested with logs that queries to get soft and hard cap actually succeed now
Logs about slash command handler command registration and vanity NPC creation in mis matched worlds are now removed.
2024-06-09 15:31:57 -07:00
Wincent Holm
1454fcd003
Fix g++ 14 ( #1610 )
...
* Fix g++ 14
* Update thirdparty/CMakeLists.txt
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
---------
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
2024-06-06 04:00:44 -05:00
Gie "Max" Vanommeslaeghe
af651f0d63
Merge pull request #1608 from DarkflameUniverse/feat--spectate-command
...
feat: spectate command
2024-06-04 09:17:18 +02:00
Aaron Kimbre
ff38503597
no feedback if empty
2024-06-03 22:51:46 -05:00
Aaron Kimbre
3f22bf5cc0
Add an easy way to stop spectating
2024-06-03 22:44:54 -05:00
Aaron Kimbre
9d5d2a68ee
fix gm serialization
2024-06-03 22:30:57 -05:00
Aaron Kimbre
1a14c29c39
add returns, lol
2024-06-03 22:29:21 -05:00
Aaron Kimbre
2ef45bd7ee
use empty
2024-06-03 22:28:37 -05:00
Aaron Kimbre
b56d077892
feat: spectate command
2024-06-03 21:50:12 -05:00
David Markowitz
a54600b41e
busting out the multimap ig ( #1602 )
2024-05-31 13:46:18 -05:00
David Markowitz
342da927f5
fix dimantling items from not the model inventory ( #1605 )
2024-05-30 23:53:13 -05:00
David Markowitz
01086d05c8
fix: use after free and uninitialized memory ( #1603 )
...
* fix use after free and uninitialized memory
* add if check for packet lengths
* move purge down further
Its used in the if check too...
2024-05-30 23:53:03 -05:00
Remco Hofman
cce5755366
Fix Dockerfile vanity COPY ( #1604 )
...
Corrected an unintended mistake in the COPY commands for adding the
vanity files to the Docker container, causing only the last file
contents to be added to the file '/app/vanity/*'
2024-05-27 17:46:09 -07:00
TAHuntling
e966d3a644
Chore: split VE script up ( #1598 )
...
* Testing Scripts
Testing splitting AgSpaceStuff into AgSpaceStuff and AgShipShake
* fixed inclusions
* Removed DoShake
* cleaning up
* consistent if statements
* Update dScripts/ai/AG/AgShipShake.h
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
---------
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
2024-05-27 01:24:48 -05:00
Gie "Max" Vanommeslaeghe
9328021339
Merge pull request #1600 from DarkflameUniverse/add-missing-scripts
...
fix: add back missing scripts from scripts refactor
2024-05-26 12:02:12 +02:00
Gie "Max" Vanommeslaeghe
d1134fdd62
Merge pull request #1601 from DarkflameUniverse/fix-using-skill-in-race
...
fix: players using non-car skills in a race
2024-05-26 12:01:54 +02:00
David Markowitz
efa658bc31
fix players using non-car skills in a race
2024-05-25 19:59:15 -07:00
David Markowitz
e59525d2ae
Update CppScripts.cpp
2024-05-25 19:32:18 -07:00
David Markowitz
0348db72a5
fiux mission ( #1596 )
2024-05-25 12:24:02 -05:00
TAHuntling
debc2a96e2
Update CppScripts exclusion list ( #1597 )
2024-05-25 01:43:32 -07:00
Aaron Kimbre
86f335d64b
fix type
2024-05-24 21:43:54 -05:00
Aaron Kimbre
8ca05241f2
fix: prevent moving items between inventories under cetain circumsances
2024-05-24 21:35:14 -05:00
David Markowitz
8ae1a8ff7c
fix stale reference ( #1594 )
2024-05-24 09:15:30 -05:00
David Markowitz
f0960d48b2
Add more modular saving of config data for items ( #1591 )
...
* stubbing for saving item extra data
* add declaration to header
* modularize loading for all possible extra data
* move logic to Item
* remove extra map
2024-05-22 17:06:52 -07:00
David Markowitz
dc430d9758
Add reputation as a repeatable mission reward ( #1590 )
...
This reverts commit 7d1a28b492b263aba2008a5984dc0f5e7348a068.
Add stubbing for abbreviations
Reward reputation always if possible
2024-05-22 16:35:45 -07:00
TAHuntling
dea10c6d56
Client commands implementation ( #1592 )
...
* Adding Client Commands
Adding list of client commands provided to me by EmosewaMC
* Finished adding client commands
2024-05-22 08:32:24 -05:00
TAHuntling
ed00551982
feat: Help Command Pagination ( #1581 )
...
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Fixed Comments
Now able to do /command help to see info for said command. Additionally this works for aliases. Fixed serialization missing from merge.
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
* Update SlashCommandHandler.cpp
2024-05-21 20:02:07 -05:00
TAHuntling
d6cac65a8d
fix: Falling Off Edge in Pet Puzzle ( #1584 )
...
* FloatFix
* game activity setting
* Update dNavMesh.cpp
---------
Co-authored-by: David Markowitz <EmosewaMC@gmail.com>
2024-05-21 20:01:44 -05:00
David Markowitz
d8f079cb1b
fix mpc resetting on each world load ( #1588 )
2024-05-20 02:43:57 -05:00
David Markowitz
db2d4f02b5
preemptive include for windows
2024-05-18 04:16:07 -07:00
