Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
8a36078
Restoring repository with new project structure
iniside Jul 1, 2017
fa26827
removing files
iniside Jul 1, 2017
bcdb133
Merge remote-tracking branch 'origin/master'
iniside Jul 1, 2017
615e25b
new gitignore
iniside Jul 1, 2017
24a729a
update gitignore
iniside Jul 1, 2017
e70d6c3
cleaining up fallout for latest ue master, and fixed some sequencer c…
iniside Jul 4, 2017
2360762
fixed crash on ability activation
iniside Jul 4, 2017
23bbc70
Adding ability helpers
iniside Jul 5, 2017
314258b
Working on UI
iniside Jul 16, 2017
a194087
Added async loading of ability assets
iniside Jul 16, 2017
9cf8aac
Async ability loading fixes
iniside Jul 27, 2017
fb8b9b9
New event handling system
iniside Aug 8, 2017
e572368
missing files
iniside Aug 11, 2017
b92dd1a
Fixed asyc loading in cooked build
iniside Aug 12, 2017
20ceeeb
Fixing linux build
iniside Aug 17, 2017
c4e4d0f
Disabled unused pluygins and fixed crashes when changing map
iniside Aug 20, 2017
3445d59
Fixes
iniside Sep 15, 2017
14d5c61
fixing multiplayer issues and working on better prediction.
iniside Oct 14, 2017
2aeb2d1
Better handling for replicated attribute sets.
iniside Oct 15, 2017
56723f7
Started work on in game ability framework debugger. Added separate mo…
iniside Dec 14, 2017
a645a21
Speculative fix for condition race
iniside Dec 17, 2017
f454fd8
added very ugly hack to make Standalone Game from editor work, aded m…
iniside Dec 22, 2017
f4a086c
improvements to debugger and draggable window
iniside Dec 30, 2017
b772856
draggable window fixes
iniside Jan 6, 2018
2639d16
plugin updates
iniside Jan 22, 2018
57c11c3
prototype update
iniside Jan 22, 2018
91bded1
starting sample to Spectr
iniside Jan 23, 2018
58ba106
Spectr update
iniside Jan 23, 2018
175acae
Spectr goal
iniside Jan 23, 2018
73abfce
Chaged action search from forward to reverse.
Jan 24, 2018
91bbafb
spectr update
iniside Jan 24, 2018
aa95392
Spectr prototyping plan searching
iniside Jan 25, 2018
61e5815
spectr- prototyping movement
iniside Jan 27, 2018
7f0ad43
spectr update
iniside Jan 28, 2018
2164baa
abilities update
iniside Jan 28, 2018
2e57875
fixed ability activation crash
iniside Jan 29, 2018
2482976
change how periodic abilities should be created and fixed ability can…
iniside Jan 29, 2018
0d33168
if ability is already bound to input, first remove ability and then a…
iniside Jan 29, 2018
cf3b77c
ability check fixed
iniside Jan 29, 2018
5d32602
fix
iniside Jan 29, 2018
1382556
fix
iniside Jan 29, 2018
30083df
Effect Cues will now use tags and asset manager to load, instead of c…
iniside Jan 30, 2018
7a7e997
loading effect cues from asset registry
iniside Jan 30, 2018
4806b3e
removed dead code
iniside Jan 31, 2018
74f5389
spectr added delay between planning
iniside Jan 31, 2018
9e2745e
added base weapon class and removed dead code
iniside Feb 1, 2018
f7eaa32
fixed window dragging
iniside Feb 3, 2018
0fa9fff
prototyping weapon Equiping/Weapon Ability, added prototype ability m…
iniside Feb 4, 2018
2cb5ca5
prototyping weapons, added basic weapon replication, fixed some bugs …
iniside Feb 4, 2018
e0d326b
weapon replication fixes
iniside Feb 5, 2018
8a8d122
working on weapon attachment replication and ability avatar
iniside Feb 6, 2018
71f1dc8
changed weapon attachment
iniside Feb 7, 2018
cefb236
more weapon attachment work
iniside Feb 10, 2018
0aaa89c
fixes for weapon swapping
iniside Feb 10, 2018
aa97c83
started refactoring of AbilityFramework to remove dead code and minim…
iniside Feb 11, 2018
231022f
first part of refactor, Splitted effects into seprate component and s…
iniside Feb 12, 2018
8f6b67f
removing more redunant code from effects system
iniside Feb 13, 2018
2a6ac77
changed handle to contain raw pointer instead of shared, because it c…
iniside Feb 15, 2018
3c1fdde
refactoring of effects system
iniside Feb 20, 2018
f146514
fixed draggable window and Effect going out of scope before added to …
iniside Mar 6, 2018
fa13475
changed TSharedPtr to raw pointer
iniside Mar 6, 2018
b02c32d
removing dead code
iniside Mar 7, 2018
61faa90
added early out to ApplyEffect function. Uses new function in Applica…
iniside Mar 7, 2018
022dc28
ARG-9 Add missing files
iniside Mar 7, 2018
4857075
added check before revmoing effect, to see if we are trying to remove…
iniside Mar 7, 2018
020c571
missing change
iniside Mar 7, 2018
6a475b4
EffectSpec will now properly create Effect Extension
iniside Mar 7, 2018
be1baee
compile fix
iniside Mar 7, 2018
66c4a7a
another compile fix
iniside Mar 7, 2018
5f2cb79
ARG-10 fixed issue where Effect Execution was garbage collected from …
iniside Mar 8, 2018
e6dd002
check if extension class is valid before trying to create it
iniside Mar 8, 2018
556748f
set extension to nullptr
iniside Mar 8, 2018
ec165f3
attach camera boom to socket on skeletal mesh
iniside Mar 8, 2018
dcb7c50
change name to better reflect functionality
iniside Mar 9, 2018
423d803
fixed issue where clicking Edit button on effect property caused inva…
iniside Mar 9, 2018
f963fbc
ARG-6 Effect Extension now support GameplayTasks properly. Simple tas…
iniside Mar 9, 2018
2c2c663
ARG-13 added more granular and varied events generated by effects
iniside Mar 10, 2018
5cdc03b
ARG-16 aded 3 functions to access EffectSpec from blueprint
iniside Mar 10, 2018
8f9864e
disbaled debug drawing
iniside Mar 10, 2018
4611683
ARG-17 added ability to apply other effects when main effect is applied
iniside Mar 10, 2018
ad488c3
working on prototype HUD
iniside Mar 21, 2018
713dd60
fixes
iniside Mar 21, 2018
23c3b0c
new tags, bindings and gitignote
iniside Mar 22, 2018
867dfaf
added bool to indicate if window should be destroyed on closing or ju…
iniside Mar 22, 2018
ddf126c
ability manager will now display abilities icons
iniside Mar 22, 2018
552530a
added widget to show ability cooldown on crosshair
iniside Mar 22, 2018
be59737
add base classes for weapon managing GUI
iniside Mar 23, 2018
2b81f2d
add check to see if the index is valid
iniside Mar 23, 2018
732eb50
fixing compilation issues with latest master
iniside Mar 24, 2018
034ba5f
more UI work
iniside Mar 27, 2018
9395ffe
Added ability to switch ability groups
iniside Mar 28, 2018
8cd34ec
added server side confirmation for ability group selection
iniside Mar 28, 2018
125c438
prevent overiding current abilities input when equiping ability into …
iniside Mar 28, 2018
4fc41f7
exposed event when ability group/set is changing to crosshair widget
iniside Mar 29, 2018
4e71034
added ability task for line trace (does not support netowrking yet), …
iniside Mar 30, 2018
69888cc
more work on ability tracing tasks
iniside Apr 2, 2018
b86cea2
remove simulated tasks, when ability that created them is removed
iniside Apr 2, 2018
d081d54
add damage effect array for weapon ability, and BP function to apply it
iniside Apr 3, 2018
59831ec
added ability event called after ability has been bound to some input
iniside Apr 3, 2018
09a7a93
fixed ability not being added to ability map on clients
iniside Apr 3, 2018
b66f17a
cache weapon actor in weapon ability
iniside Apr 3, 2018
7ef1824
ability attribute cost is now array>
iniside Apr 3, 2018
95bb246
added support for attribute cost from owner
iniside Apr 3, 2018
e18758e
fixed target and annded BP check function
iniside Apr 3, 2018
e3f07e2
ARG-29 removing dependency on GameplayTasks module, as it's functiona…
iniside Apr 5, 2018
a7cfe65
ARG-29 removing more GameplayTasks module dependencies
iniside Apr 6, 2018
46f4ba4
changed GALatentFunctionBase to AFTaskBAse to better reflect intended…
iniside Apr 7, 2018
c9fd4e8
ability tasks are now using template to instance instead of interface
iniside Apr 7, 2018
1538658
formatting
iniside Apr 7, 2018
696e320
removed old task creation functions, and refactored Effect Tasks for …
iniside Apr 7, 2018
e8f7e60
working on ability/effects tasks
iniside Apr 7, 2018
34ec8df
unregistering delegates from effect tasks
iniside Apr 7, 2018
d914663
refactored AbilityFramework to use TSoftClassPtr instead of GameplayT…
iniside Apr 8, 2018
605ab78
ARG-31 removed redunant input validation
iniside Apr 9, 2018
d89ab4c
cleaned up ability component code
iniside Apr 9, 2018
f918ba1
protptyping weapon modifications/upgrades
iniside Apr 10, 2018
c3147b6
more prototype code for weapon mods/upgrades
iniside Apr 10, 2018
f38c914
ARG-33 base inventory
iniside Apr 11, 2018
d7e25f2
prototype item pickup from actor
iniside Apr 11, 2018
131bf2c
added moveITem function
iniside Apr 12, 2018
5c62ff1
working on basic inventory widgets
iniside Apr 13, 2018
c04b911
selectable item widget class
iniside Apr 13, 2018
45b8276
added OrionAnimation module (it doesn't really do anything)
iniside Apr 13, 2018
aa569d2
created base UMG widgets for inventory, and exposed more hook from in…
iniside Apr 13, 2018
7cea8e5
better handling for null items
iniside Apr 13, 2018
8487f91
moving weapon manager to new Inventory system
iniside Apr 14, 2018
d814e90
fixed compilation, and adding more missing functionality to weapons/i…
iniside Apr 14, 2018
8083b1b
removing dead code
iniside Apr 14, 2018
75164dd
working on initialization order in network, for inventories
iniside Apr 14, 2018
a09bc34
removing more dead code
iniside Apr 14, 2018
0233908
added ability to specify which type of item will be accepted by inven…
iniside Apr 14, 2018
aceb7fd
inventory now handle item removal event, swapping items between compo…
iniside Apr 14, 2018
728c186
changed how weapon input is bound, Now wait till the weapon is actual…
iniside Apr 15, 2018
eabc835
working on inventory screen widget
iniside Apr 16, 2018
de547d5
removing duplicate/dead UI classes, in prepration for UI refactor
iniside Apr 16, 2018
34571f6
move files
iniside Apr 16, 2018
c9b879f
working on player inventory screen
iniside Apr 17, 2018
e4c5a84
working on weapon upgrade ui
iniside Apr 17, 2018
31c288d
prototype weapon upgrades
iniside Apr 18, 2018
6458d3b
more work on item and weapons upgrades
iniside Apr 19, 2018
53d4f5e
fixed compilation errors
Apr 20, 2018
6f08bd8
modifying items to use struct data, for replication
Apr 20, 2018
8524e31
added empty function for creating item from JSON, added template func…
iniside Apr 20, 2018
eb7ef1f
prototype json item serialization, for future integration with extern…
iniside Apr 22, 2018
6f8962d
prototyping json items
iniside Apr 23, 2018
d658fe3
reworking invetory plugin to work only with RPCs
iniside Apr 25, 2018
60e7cb5
move more of inventory to use RPC
iniside Apr 26, 2018
aca1732
add RPC to Equip weapon and fixed ability equiping over network
iniside Apr 27, 2018
334ff0d
typo fix
iniside Apr 27, 2018
5d2dcdd
missing changes
iniside Apr 27, 2018
832e0e2
added weapon holstering
iniside Apr 28, 2018
26f820d
changed files organization, because of last changes in master branch
iniside Apr 29, 2018
316fa44
weaponm abilities are now instanced trough weapon inventory component
iniside Apr 30, 2018
8a6f373
removing weapon manager component
iniside Apr 30, 2018
5718e13
adding missing files from last folder reorganizaion
iniside Apr 30, 2018
c67f1ff
adding back weapon upgrades
iniside Apr 30, 2018
7c38fd3
added ability to remove equiped weapon
iniside Apr 30, 2018
c8d787f
changed applying magazine upgrade to be inline with other inventory f…
iniside Apr 30, 2018
4f0da61
multicast remove weapon
iniside Apr 30, 2018
082745f
compilation fix
iniside Apr 30, 2018
b7a04ed
changed main source structure to match Public/Private
iniside May 1, 2018
43bd898
working on weapon upgrades
iniside May 3, 2018
e9ac703
fixes
iniside May 3, 2018
12c3426
still working on item upgrades. Moved all weapon upgrade functionalit…
iniside May 4, 2018
bbb5f0b
added some rudimentary tooltip support and fixed attribute copy
iniside May 5, 2018
43ff093
tooltips for items in invetory lists
iniside May 5, 2018
8d12bf7
prototype item serialization to Json
iniside May 5, 2018
9a4c203
moved json UObject serialization into seprate plugin, working on inve…
iniside May 6, 2018
702fdcb
working on items
iniside May 6, 2018
fc17008
stub character equipment component
iniside May 6, 2018
807dd69
added GameSparks integration
iniside May 7, 2018
bcb6ac2
fixed compilation errors/warrning for Linux server, windows server an…
iniside May 9, 2018
75b8f40
compilation fixes with latest master and clang
iniside May 11, 2018
ced2faa
compilation fixes and further integration with backend
iniside May 14, 2018
7f301d4
fixed some asset loading issues in cooked build
iniside May 15, 2018
154c48e
fixed effect cues no loaded into asset registry in cooked builds
iniside May 16, 2018
050286b
missing files
iniside May 16, 2018
85c30a9
added registartion screen, and termination of game session when there…
iniside May 17, 2018
65b41e9
added item spawner, enemy spawner, fixed replication error
iniside May 20, 2018
b136345
modified attribute modify function to take Context Handle, modifier A…
iniside May 21, 2018
f8a8fa8
work around to broken SetMasterPoseComponent which does not properly …
iniside Jun 4, 2018
d88f73d
missing header
iniside Jun 4, 2018
b3a9d9a
new plugin
iniside Jun 12, 2018
19c0e9c
removing GameLift and GameSparks
iniside Jun 13, 2018
374ade6
fix spawned crash
iniside Jun 13, 2018
3ba55e2
fix crash when there is no target
iniside Jun 14, 2018
cf2216a
syncing changes with perforce, ability is now identified by handle in…
iniside Jul 1, 2018
71eafc2
Syncing changed with P4. Reworked how cues work. Thy are now split in…
iniside Jul 10, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

19 changes: 11 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,14 @@ pip-log.txt

#Unreal Engine

.vs/
.vs/*
Binaries/
Plugins/
Plugins/*

Content/*
Substance/
Substance/*
!Content/Blueprints/
!Plugins/GameInventorySystem/Content
!Plugins/GameInventorySystem/Source
!Plugins/GameAttributes/Content
!Plugins/GameAttributes/Source
!Plugins/TimeOfDay/Content
!Plugins/TimeOfDay/Source
DerivedDataCache/
Intermediate/
Saved/
Expand All @@ -266,3 +263,9 @@ Saved/
CodeBackup/States/GASAbilityStateCooldown.h
*.bin
*.pak
Config/DefaultARGame.ini
Plugins/*
!Plugins/AbilityFramework/
!Plugins/AbilityFramework/Source/
!!Plugins/AbilityFrameworkEditor/
!Plugins/AbilityFrameworkEditor/Source/
3 changes: 0 additions & 3 deletions .vs/ProjectSettings.json

This file was deleted.

9 changes: 0 additions & 9 deletions .vs/VSWorkspaceState.json

This file was deleted.

1,031 changes: 0 additions & 1,031 deletions .vs/config/applicationhost.config

This file was deleted.

Binary file removed .vs/slnx.sqlite
Binary file not shown.
243 changes: 231 additions & 12 deletions ActionRPGGame.uproject
Original file line number Diff line number Diff line change
@@ -1,43 +1,262 @@
{
"FileVersion": 3,
"EngineAssociation": "{A035B080-4493-F253-AA70-EF8A66B855F8}",
"EngineAssociation": "",
"Category": "",
"Description": "",
"Modules": [
{
"Name": "ActionRPGGame",
"Type": "Runtime",
"LoadingPhase": "Default"
"LoadingPhase": "Default",
"AdditionalDependencies": [
"AbilityFramework",
"InventoryFramework",
"Engine",
"AIModule",
"UMG",
"CoreUObject",
"Slate",
"SlateCore",
"InventoryFrameworkUI"
]
},
{
"Name": "ActionRPGGameEditor",
"Type": "Editor",
"LoadingPhase": "Default",
"AdditionalDependencies": [
"AbilityFramework",
"AbilityFrameworkEditor",
"InventoryFramework",
"Engine",
"AIModule",
"UMG",
"CoreUObject"
]
}
],
"Plugins": [
{
"Name": "CodeView",
"Name": "ActorSequence",
"Enabled": true
},
{
"Name": "AbilityFramework",
"Enabled": true
},
{
"Name": "InventoryFramework",
"Enabled": true
},
{
"Name": "InventoryFrameworkUI",
"Enabled": true
},
{
"Name": "ActorSequenceEditor",
"Enabled": true
},
{
"Name": "ImagePlate",
"Enabled": true
},
{
"Name": "PerformanceMonitor",
"Enabled": true
},
{
"Name": "OnlineFramework",
"Enabled": true
},
{
"Name": "ActionRPGGameUI",
"Enabled": true,
"Type": "Editor"
"BlacklistTargets": [
"Server"
]
},
{
"Name": "GRPC",
"Enabled": true
},
{
"Name": "SteamVR",
"Enabled": false
},
{
"Name": "OculusVR",
"Enabled": false
},
{
"Name": "Niagara",
"Enabled": true
},
{
"Name": "SoundUtilities",
"Enabled": true
},
{
"Name": "SoundVisualizations",
"Enabled": true
},
{
"Name": "BlueprintStats",
"Enabled": true
},
{
"Name": "LocationServicesBPLibrary",
"Enabled": false
},
{
"Name": "WindowsDeviceProfileSelector",
"Enabled": true
},
{
"Name": "AndroidDeviceProfileSelector",
"Enabled": false
},
{
"Name": "IOSDeviceProfileSelector",
"Enabled": false
},
{
"Name": "AndroidMedia",
"Enabled": false
},
{
"Name": "MessagingDebugger",
"Name": "MobileLauncherProfileWizard",
"Enabled": false
},
{
"Name": "MobilePatchingUtils",
"Enabled": false
},
{
"Name": "AndroidMoviePlayer",
"Enabled": false
},
{
"Name": "AppleMoviePlayer",
"Enabled": false
},
{
"Name": "GoogleCloudMessaging",
"Enabled": false
},
{
"Name": "OnlineSubsystemIOS",
"Enabled": false,
"SupportedTargetPlatforms": [
"IOS",
"TVOS"
]
},
{
"Name": "OnlineSubsystemGooglePlay",
"Enabled": false,
"SupportedTargetPlatforms": [
"Android"
]
},
{
"Name": "ApexDestruction",
"Enabled": true
},
{
"Name": "AndroidPermission",
"Enabled": false
},
{
"Name": "AppleARKit",
"Enabled": false
},
{
"Name": "GLTFImporter",
"Enabled": true
},
{
"Name": "SteamAudio",
"Enabled": true,
"Type": "Editor"
"BlacklistTargets": [
"Server",
"Client"
]
},
{
"Name": "ControlRig",
"Name": "ResonanceAudio",
"Enabled": false,
"BlacklistTargets": [
"Server",
"Client"
]
},
{
"Name": "CodeView",
"Enabled": true
},
{
"Name": "SignificanceManager",
"Enabled": true
},
{
"Name": "CustomAnimNode",
"Enabled": true,
"Type": "Editor"
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/8901af6d589b40b68d763b44c9ced66c"
},
{
"Name": "PerformanceMonitor",
"Name": "Substance",
"Enabled": true,
"Type": "Editor"
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/2f6439c2f9584f49809d9b13b16c2ba4",
"BlacklistTargets": [
"Server",
"Client"
]
},
{
"Name": "ActorSequenceEditor",
"Name": "LiveLink",
"Enabled": true
},
{
"Name": "ReplicationGraph",
"Enabled": true
},
{
"Name": "NiagaraExtras",
"Enabled": true
},
{
"Name": "MagicLeapMedia",
"Enabled": false,
"SupportedTargetPlatforms": [
"Lumin"
]
},
{
"Name": "MagicLeapEmulator",
"Enabled": false,
"SupportedTargetPlatforms": [
"Lumin"
]
},
{
"Name": "MagicLeap",
"Enabled": false,
"SupportedTargetPlatforms": [
"Lumin"
]
},
{
"Name": "AppleVision",
"Enabled": false
},
{
"Name": "RootMotionExtractor",
"Enabled": true,
"Type": "Editor"
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/4b450f82f56040338a4d5744b3eda4f9"
}
],
"TargetPlatforms": [
"LinuxNoEditor",
"WindowsNoEditor"
]
}
25 changes: 25 additions & 0 deletions Agones/Agones.uplugin
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"FileVersion" : 3,

"FriendlyName" : "Agones Plugin",
"Version" : 1,
"VersionName" : "1.0",
"CreatedBy" : "Epic Games, Inc.",
"CreatedByURL" : "http://epicgames.com",
"Description" : "Integration with Kuberenetes Agones.",
"Category" : "Dedicated Server",
"EnabledByDefault" : false,

"Modules": [
{
"Name": "Agones",
"Type": "Runtime"
}
]
"Plugins": [
{
"Name": "GRPC",
"Enabled": true
}
]
}
Binary file added Agones/Resources/Icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading