Commit graph

96 commits

Author SHA1 Message Date
Simon Jarrett
e91df41c8e more conversions to weak pointers 2018-06-21 23:32:21 +01:00
Simon Jarrett
b08ab94319 fixed disappearing doors and made some more pointers weak 2018-06-16 11:57:58 +01:00
Simon Jarrett
6a28ee6df0 Changed the way shared/weak pointers are nulled 2018-06-06 18:08:32 +01:00
Simon Jarrett
b41aee01c7 Some fixes with DArrays 2018-05-31 22:37:20 +01:00
Simon Jarrett
f71e11870a fixes to weak ptrs that used to be shared 2018-05-31 18:00:27 +01:00
Simon Jarrett
0b1397574a fixes to shared pointers 2018-05-24 22:28:15 +01:00
Simon Jarrett
9ea163be50 changed all pointers to CPhysicsObj to shared pointers (and thus all weenies, etc.) 2018-05-23 13:45:22 +01:00
Simon Jarrett
b2b73fcc83 Removed login delay added for testing 2018-05-21 23:52:54 +01:00
Simon Jarrett
b33ea80a44 Added PK timer for vulns/debuffs and projectile spells 2018-05-20 17:53:49 +01:00
Simon Jarrett
5d4e6bbcae Players will now stand still before the logout animation rather than after. 2018-05-20 17:32:55 +01:00
Simon Jarrett
db2d63a683 added delay for logout after PK combat 2018-05-19 20:03:13 +01:00
LikeableLime
fbb2559484 Merge branch 'SalvagingTweaks' into 'TestServer'
Reworked the perform salvaging code to prevent bags being created with higher ws that its contents.

See merge request Scribble/gdlenhanced!78
2018-05-16 23:49:20 +00:00
LikeableLime
168b851c82 Merge branch 'SalvagingAmountFix' into 'TestServer'
Fix rounding error causing salvaging to return a bag of 1 when skill is less than 195

See merge request Scribble/gdlenhanced!82
2018-05-16 23:48:00 +00:00
Scruples
9f51e6f38e Minor tinkering formula fixes 2018-05-16 23:47:32 +00:00
Simon Jarrett
a93eb70b6d Fix rounding error causing salvaging to return a bag of 1 when skill is less than 195 2018-05-16 22:30:21 +01:00
Simon Jarrett
705335ebca Reworked the perform salvaging code to prevent bags being created with higher ws that its contents. 2018-05-15 22:46:05 +01:00
LikeableLime
7df55bb91f Added AdjustHealth override to clear Damage Sources list when reaching full hp via heal spells and transfers. Also changed heal kits and food to use this new override.
Added OnTookDamage to be called again after the kill messages are built to fix kill messages.

Damage Sources is now cleared on death as well.
2018-05-15 00:04:29 -05:00
Simon Jarrett
a574ddc9ad fix for salvage value 2018-05-15 00:14:44 +01:00
Simon Jarrett
7c78c1a450 Fixed the bug where items randomly disappear from inventory.
Wielded items can no longer be put in the trade window.
2018-05-12 13:28:08 +01:00
mwnciau
2537ca6821 fixed some possible npes with trading 2018-05-11 00:14:42 +00:00
LikeableLime
44d70b105b whoopsie doodles - need a } at the end of Tick() 2018-05-10 16:58:48 -05:00
mwnciau
53b58375d2 Added trading 2018-05-10 21:07:44 +00:00
LikeableLime
cdfeafb8e4 Merge branch 'HealthUpdates' into 'TestServer'
Health updates

See merge request Scribble/gdlenhanced!48
2018-05-10 06:30:54 +00:00
LikeableLime
f325fd55dd Merge branch 'KillRewards' into 'TestServer'
Various fixes to kill rewards

See merge request Scribble/gdlenhanced!54
2018-05-10 06:24:33 +00:00
mwnciau
216118b80b Fix deaths 2018-05-10 06:21:14 +00:00
mwnciau
17688d78da Minor fixes 2018-05-08 23:13:37 +00:00
LikeableLime
cccbbef433 Merge branch 'CraftingConfirm' into 'TestServer'
Crafting confirm

See merge request Scribble/gdlenhanced!49
2018-05-07 18:32:34 +00:00
Simon Jarrett
6893dedb27 Various fixes to kill rewards
*  Looting permission goes to player who did most damage
*  Damage to NPC is reset once it regens back to full hp
*  XP is distributed evenly amongst attackers
2018-05-07 14:13:40 +01:00
mwnciau
136e752a6e Salvaging fixes 2018-05-07 06:57:51 +00:00
Simon Jarrett
595345de7f Added some clean up and changed message order for tinkering 2018-05-06 18:40:25 +01:00
Simon Jarrett
3fc459ca64 Changed to only display chance of success when the option is toggled on 2018-05-06 18:36:41 +01:00
Simon Jarrett
540162d1b5 Added the confirm dialog for crafting 2018-05-06 18:30:12 +01:00
Scribble
32d94aedb3 Merge branch 'MinorFixes' into 'TestServer'
Minor fixes

See merge request Scribble/gdlenhanced!47
2018-05-06 01:56:08 +00:00
Simon Jarrett
b446b8fe15 Health bars for targets will now update.
A "0x01C0: Combat_QueryHealthResponse" message will be sent for the last creature the player received a health request for when:
1) The player deals melee damage
2) The player deals spell damage
3) Every PLAYER_HEALTH_POLL_INTERVAL seconds otherwise (currently set to 5)
2018-05-06 02:15:58 +01:00
LikeableLime
0e41361845 Merge branch 'SalvagingMessages' into 'master'
A message is now sent to the client after salvaging items

See merge request Scribble/gdlenhanced!44
2018-05-05 21:37:16 +00:00
LikeableLime
7150a266d9 Merge branch 'CraftingWithStacks' into 'master'
Fixed a bug where a stack of items would be removed from shortcuts when the target of a use action

See merge request Scribble/gdlenhanced!41
2018-05-05 21:16:08 +00:00
Simon Jarrett
0b2125d1d4 A message is now sent to the client after salvaging items 2018-05-05 22:13:16 +01:00
Simon Jarrett
9c618675e4 Display a "Your craft attempt fails" error message when crafting fails. 2018-05-05 21:14:26 +01:00
Michael Rath
1c18c1a803 Get salvage mod from Material property 2018-05-05 09:12:22 -07:00
Simon Jarrett
e98eb30e28 Fixed a bug where a stack of items would be removed from shortcuts when the target of a use action 2018-05-05 12:44:25 +01:00
LikeableLime
01126576fb swapped min for max in item drop formula 2018-05-04 17:10:42 -05:00
Michael Rath
eb0100fc1c Change Lower to Upper 2018-05-02 21:54:52 -07:00
Michael Rath
b2b66832c5 Added number of items dropped on death to match live
TODO: handle the non-wielded for the two tiers
Added check to get Mod of salvage by salvage type
2018-05-02 21:12:01 -07:00
fourk
b925ac98a2 fix mana stone application being able to exceed max_mana 2018-05-02 15:42:03 -07:00
Justin Kennedy
1592d60fea Hopefully fixed Clutch Of The Miser 2018-05-02 14:05:10 -04:00
LikeableLime
21958d6558 Merge branch 'master' of https://gitlab.com/Scribble/gdlenhanced 2018-05-01 01:57:13 -05:00
LikeableLime
1f23d6f184 misc bug fixes.
Hopefully fixed a few crashes around GetID() being called when the entity does not exist.
Thanks to gmriggs for the BSPData.cpp fix
2018-05-01 01:56:48 -05:00
Michael Rath
7452f3407e Logging for exceptions around arrays and iterators 2018-04-30 22:39:01 -07:00
LikeableLime
6ae4745cf7 Revert "Switched imbue chance to min between success chance and 33% rather than dividing…"
This reverts commit de57972ae8
2018-04-29 23:32:39 +00:00
LikeableLime
0d650e96b6 Merge branch 'master' into 'miscfixes'
Master

See merge request Scribble/gdlenhanced!27
2018-04-29 21:15:49 +00:00