f2c18b6a4c
Merge remote-tracking branch 'lorealisnat/main'
2025-10-15 10:49:42 -06:00
Lore Natusol
dc6acbcbdb
Merge pull request #60 from Treefel/ShrinesAndTavern
...
Created branch, added Shrines and Tavern
2025-10-14 22:52:17 -05:00
Treefel
416dfc0c2d
Created branch, added Shrines and Tavern
2025-10-14 21:46:25 -06:00
3eaa2ce106
Merge remote-tracking branch 'main/main'
2025-10-14 11:05:16 -06:00
Lore Natusol
aeda8f0571
Merge pull request #59 from Civilhero/main
...
Modeled, UV mapped, and added materials to my meshes
2025-10-14 12:00:47 -05:00
Allen Larsen
bed7af6fe4
Modeled, UV'd, and added materials
...
Made and UV mapped books, front hinges, and a rug. I also made changes to my other models so that different materials can be added to different sections of the mesh.
2025-10-14 10:58:59 -06:00
Bryce Douglas Olcott
ea79a4a366
Merge remote-tracking branch 'main/main'
2025-10-14 10:49:26 -06:00
Bryce Douglas Olcott
5138042732
Auto stash before rebase of "main" onto "main/main"
2025-10-14 10:48:23 -06:00
Bryce Douglas Olcott
2b794e6836
Auto stash before rebase of "main" onto "main/main"
2025-10-14 10:43:10 -06:00
Lore Natusol
a2ca771b10
Merge pull request #58 from IvanEnvoi/main
...
more plants added, materials added to all plants and trees
2025-10-14 11:37:47 -05:00
Lore Natusol
bf7134143b
Merge pull request #57 from G-ranium/main
...
Gate house with empty interior
2025-10-14 11:37:34 -05:00
b1249b756e
fixed missing BP
2025-10-13 21:52:52 -06:00
Ivan
28239a8359
5 big trees
2025-10-10 01:11:26 -06:00
Ivan
53b1d54f61
more plants added, materials added to all plants and trees
2025-10-09 18:42:48 -06:00
7bdccd9af9
Merge branch 'lorealisnat:main' into main
2025-10-09 09:10:22 -06:00
fbc63350a3
fixing thinbgs
2025-10-09 07:17:27 -06:00
599cd852d0
fixing things
2025-10-09 07:16:38 -06:00
Gavin Taylor
33479514d8
Merge branch 'lorealisnat:main' into main
2025-10-08 15:21:42 -06:00
G-ranium
073a36c15b
Gate house created, empty interior
2025-10-08 15:21:20 -06:00
Lore Natusol
92fe7e3268
Merge pull request #56 from Mastraga/main
...
Gave barrels, crates, and weapons proper sizes and materials
2025-10-08 08:04:38 -05:00
Lore Natusol
540b166640
Merge pull request #55 from Civilhero/main
...
modeled and uv'd decorative stuff
2025-10-08 08:04:25 -05:00
Lore Natusol
bf497dea08
Merge pull request #54 from roo353/main
...
Adding Material Pack
2025-10-08 08:04:11 -05:00
Mason S.
fd5042c77f
Gave barrels, crates, and weapons proper sizes and materials
2025-10-07 23:33:16 -06:00
cc0a691b31
fixing things
2025-10-07 13:41:34 -06:00
Allen Larsen
5118dad8ee
Modeled and UV Mapped decorative stuff
...
made and uv'd a new bed, treasure chests, books, and a key (for decoration)
2025-10-07 13:04:59 -06:00
Kaitlyn Kinsey
559dc10188
Adding Material Pack
2025-10-07 11:48:05 -06:00
Lily Wilson
d0105fde7d
Valorvale Map Update 01
2025-10-07 06:34:02 -06:00
Lore Natusol
d2e527041f
Merge pull request #53 from roo353/main
...
Textured Castle and Houses
2025-10-06 20:15:04 -06:00
Lore Natusol
8a59131f1d
Merge pull request #52 from TheRiverNyx/main
...
bunch o' fixes(not done)
2025-10-06 20:14:55 -06:00
Kaitlyn Kinsey
2fcbfe1859
Textured Castle and Houses
2025-10-06 15:53:55 -06:00
cf27248f9c
Merge branch 'main' of github.com:TheRiverNyx/ElistriaCalling
...
# Conflicts:
# Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset
# Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
# Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
# Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp
# Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp
# Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp
# Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
# Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h
2025-10-06 04:22:29 -06:00
f32d8cf0d6
Misc Fixes
2025-10-06 04:18:03 -06:00
eddf4b0ad9
Misc Fixes
2025-10-05 10:12:44 -06:00
Lily Wilson
ebee88c92b
Icon UI Additions + Escape Menu
2025-10-05 05:40:57 -06:00
Lore Natusol
35d818ccde
Merge pull request #51 from TheRiverNyx/main
...
)xxxxx[;;;;;;;;;>
2025-10-03 23:53:44 -06:00
e4f23cd102
Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling
2025-10-03 23:47:47 -06:00
6ed1ebec8c
CPP class changes
2025-10-03 23:47:02 -06:00
Lily Wilson
c29d2df874
Open World Map Update (Again)
2025-10-03 18:14:30 -06:00
Lily Wilson
1879ac91ff
More UI Updates
...
help this sh--tuff sucks
2025-10-03 04:10:53 -06:00
Lily Wilson
4b79e5b3d1
Magick UI Update
2025-10-03 00:24:44 -06:00
Lily Wilson
79f5033967
Quest UI Updates
2025-10-02 14:41:13 -06:00
Lore Natusol
c75233f690
Merge pull request #50 from TheRiverNyx/main
...
performed magic
2025-10-02 13:45:16 -06:00
15495e8d45
performed magic
2025-10-02 13:43:27 -06:00
Lily Wilson
cb3866e59b
UI Changes
2025-10-02 12:38:46 -06:00
Lore Natusol
5b261ae4e7
Merge pull request #49 from TheRiverNyx/main
...
More Magick stuffs
2025-10-02 12:38:20 -06:00
17fc18d878
added field of lightning equipping to WB_Magick
2025-10-02 12:33:39 -06:00
bb4f66ff12
Merge branch 'main' of github.com:TheRiverNyx/ElistriaCalling
2025-10-02 10:59:52 -06:00
5478ddb467
Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling
...
# Conflicts:
# Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset
2025-10-02 10:59:27 -06:00
3879f7f2ec
targeting stuffs
2025-10-02 10:55:08 -06:00
Lore Natusol
66e6b2b645
Merge pull request #48 from HartzellMaxPhillips/main
...
Mithral armor added
2025-10-02 10:36:11 -06:00
