mmo-ref/gdle
1
0
Fork 0
mirror of https://gitlab.com/Scribble/gdlenhanced.git synced 2026-08-17 14:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
2006 commits 7 branches 2 tags 52 MiB
Commit graph

1458 commits

Author SHA1 Message Date
Michael Rath
6365251356 NPCs should no longer interrupt emotes to players with heartbeats or other emotes 2020-05-14 23:21:41 -07:00
Michael Rath
62125d4216 Fixes first entry on properties for mutations 2020-05-14 18:09:35 -07:00
Scribble
c72a79bd4a Fixing of these things and stuff. For Reasons. 2020-05-05 22:23:42 -04:00
Michael Rath
676f1d084b Fixed crash so Dom can have his fetishes 2020-05-04 16:12:27 -07:00
Crimson Mage
548397916c Remove Hover command 2020-05-01 00:22:33 +00:00
Morosity
5d680e9c61 Merge branch 'gcc-clang-fixes' into 'TestServer' 
Gcc clang fixes

See merge request Scribble/gdlenhanced!576
 2020-04-30 16:58:53 +00:00
Code Munkey
3c24b14ae3 Gcc clang fixes 2020-04-30 16:58:53 +00:00
Morosity
d2906107d4 Merge branch 'FixSharedLum' into 'TestServer' 
Fixing quests sharing luminance

See merge request Scribble/gdlenhanced!578
 2020-04-30 04:24:13 +00:00
Michael Rath
e665b02c0d For future generator logging 2020-04-29 17:55:32 -07:00
Scribble
f67d0e026f Fixing quests sharing luminance 2020-04-29 20:27:46 -04:00
Michael Rath
e68755cd4a Updated logic to not impede streak(ing) 2020-04-29 11:44:17 -07:00
Michael Rath
c96d0517b4 Runtime changing of xp multiplers - See ConfigCommands.cpp 
ElementalModFix for red text
Error message fix for when attacked by PK when NPK
 2020-04-29 00:15:00 -07:00
Morosity
5280ae6f41 Merge branch 'smallfixes1337_1' into 'TestServer' 
Updating physics math

See merge request Scribble/gdlenhanced!574
 2020-04-29 05:14:42 +00:00
Michael Rath
880d064b7c Updating physics math 
Setting hooks & chests closable again
Changed DWORD ref to uint32_t
 2020-04-28 22:14:23 -07:00
Morosity
27fdeb3801 Merge branch 'Fix_Refuse_Give_Conflict' into 'TestServer' 
Resolve Conflict with Refuse_Give Emotes

See merge request Scribble/gdlenhanced!573
 2020-04-29 05:12:28 +00:00
Zarto
99386783bf Fix for encoutnered conflict while merging updates to Refuse_Give Emotes 2020-04-29 01:06:18 -04:00
Michael Rath
bfe64110cf Physics issue for trying to create object with id 0 2020-04-28 21:41:30 -07:00
Michael Rath
e082c9ec5a Rolling to 1.33.7 2020-04-28 21:09:31 -07:00
Morosity
fca3b5f3db Merge branch 'voidwands' into 'TestServer' 
Void stuff

See merge request Scribble/gdlenhanced!572
 2020-04-29 04:05:03 +00:00
Morosity
320e3b7967 Void casters in loot 
Spirit Drinker/Thirst update
 2020-04-29 04:05:02 +00:00
Morosity
dde2bc84ff Merge branch 'reloadcontentstuff' into 'TestServer' 
Reload quests and events json live

See merge request Scribble/gdlenhanced!568
 2020-04-29 04:04:13 +00:00
Morosity
d2ed7da617 Merge branch 'Fix_SetSolid_Command' into 'TestServer' 
Fix /setsolid command

See merge request Scribble/gdlenhanced!563
 2020-04-29 04:03:18 +00:00
Zarto
c4800b551b -Change SetSolid command to maipulate object physics state directly. 
-Change command to a pure toggle method.
 2020-04-29 04:03:18 +00:00
Morosity
cf25241884 Merge branch 'cookingwithmagic' into 'TestServer' 
Recipe System Rework

See merge request Scribble/gdlenhanced!558
 2020-04-29 04:02:53 +00:00
Code Munkey
64f2a4f174 Recipe System Rework 2020-04-29 04:02:53 +00:00
Zarto
c58767e199 Revert "Add dead code flagging comments" 
This reverts commit 0ae6df4e061a621b5127434be4adb25a8fe2ce78.
 2020-04-29 04:02:09 +00:00
Michael Rath
a611b1658b Reload quests and events json live 
/reloadevents
/reloadquests
 2020-04-27 18:44:20 -07:00
Michael Rath
9cab8c46bf Merge branch 'TestServer' of https://gitlab.com/Scribble/gdlenhanced into TestServer 2020-04-26 16:51:49 -07:00
Michael Rath
6055192565 Let it spawn, let it spawn, let it spawn 2020-04-26 16:51:36 -07:00
Morosity
66f4bc86ea Merge branch 'TestServer' into 'TestServer' 
MoreDamage!

See merge request Scribble/gdlenhanced!565
 2020-04-26 22:21:59 +00:00
LikeableLime
49df76c26f MoreDamage! 
Make spirit drinker work.
Changed spells.json to reflect the right floatstat buff per .dat file and pcaps.
 2020-04-26 22:21:59 +00:00
Morosity
7fb9ae51ae Merge branch 'eventfulgenerators' into 'TestServer' 
Handling eventgenerators better

See merge request Scribble/gdlenhanced!562
 2020-04-26 22:20:57 +00:00
Morosity
045231da2b Merge branch 'Fix_Fail_Over_RefuseEmote_Trigger' into 'TestServer' 
Fix RefuseEmote_Trigger

See merge request Scribble/gdlenhanced!553
 2020-04-26 22:20:06 +00:00
Zarto
5f98a47e56 Fix RefuseEmote_Trigger 2020-04-26 22:20:06 +00:00
Scribble
113953c208 Revert "Merge branch 'TestServer' of https://gitlab.com/Scribble/gdlenhanced into TestServer" 
This reverts commit 2179529665
 2020-04-26 18:42:47 +00:00
Scribble
69e08e655a Revert "Merge branch 'TestServer' of https://gitlab.com/Scribble/gdlenhanced into TestServer" 
This reverts commit fadf6b557a
 2020-04-26 01:31:39 +00:00
Michael Rath
3db83ba169 Handling eventgenerators better 2020-04-20 23:56:09 -07:00
Morosity
0200d30ba7 Merge branch 'treesrocksohmy' into 'TestServer' 
Rocks/trees and other things are solid now.

See merge request Scribble/gdlenhanced!561
 2020-04-21 06:53:38 +00:00
Morosity
9a367c285c Merge branch 'playermodulebufferfix' into 'TestServer' 
Fixed data corruption going to client on getting house data mixed in too early.

See merge request Scribble/gdlenhanced!560
 2020-04-21 06:53:24 +00:00
Morosity
21b8292d8d Merge branch 'voidnondotimbuefix' into 'TestServer' 
Added void to imbue CS and CB checks for projectile only (no dots)

See merge request Scribble/gdlenhanced!557
 2020-04-21 06:53:03 +00:00
Michael Rath
fa02bfc646 Rocks/trees and other things are solid now. 
Even the plateaus near neftet
 2020-04-19 15:33:10 -07:00
Michael Rath
ef4e9c5435 Fixed data corruption going to client on getting house data mixed in too early. 2020-04-19 13:02:14 -07:00
Michael Rath
545b7a5560 Doors can activate other doors if linked properly 2020-04-09 23:47:26 -07:00
Michael Rath
98b2131407 Added void to imbue CS and CB checks for projectile only (no dots) 2020-04-05 13:34:20 -07:00
Michael Rath
2221bc0db8 Removed weild requirements on armor and weapons for mobs. 2020-03-28 15:41:45 -07:00
Michael Rath
d90abd5de1 Who wants to use a portal? 2020-03-21 17:14:08 -07:00
Michael Rath
256d1fe208 Removing check that eliminates neg X & Y scatter 2020-03-21 16:03:17 -07:00
Michael Rath
5f8c30bc4c Merge conflict 2020-03-21 15:20:35 -07:00
Michael Rath
331f9d20a2 Updating hotfix for offset correcting 2020-03-21 15:18:04 -07:00
Morosity
d09ed0f9f5 Merge branch 'master' into 'TestServer' 
# Conflicts:
#   Source/WeenieFactory.cpp
 2020-03-21 22:13:18 +00:00