Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renaming and integration in content folder #18

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
7404a5f
Upgraded sources
MadMcCrow Nov 2, 2018
0a9c891
Added PlayerState Class, Revamped Team interface
MadMcCrow Nov 3, 2018
79328bf
Heavy code fixes : Added Footsteps
MadMcCrow Nov 4, 2018
b3ceef7
removed unused look methods in PlayerController
MadMcCrow Nov 18, 2018
23def3b
Updated Source code
MadMcCrow Nov 29, 2018
bc831be
Added PlayerStateBar
MadMcCrow Dec 2, 2018
ea9b32c
SaveGame system added
MadMcCrow Dec 2, 2018
0a03c75
Adapted previous classes to Save game system
MadMcCrow Dec 2, 2018
fa80f20
removed unecessary logging and optimized lookAt logic
MadMcCrow Dec 2, 2018
b1df9b6
Merge remote-tracking branch 'origin/Experimental' into LevelIntegration
Aljeune Dec 4, 2018
2f91399
Post-Merge commit
Aljeune Dec 4, 2018
ffe8479
added video widget class
MadMcCrow Dec 4, 2018
51bfd11
Updated all source code to avoid conflicts
MadMcCrow Dec 5, 2018
d6f3452
Merge remote-tracking branch 'Origin/Experimental' into LevelIntegration
Aljeune Dec 6, 2018
45d3985
Checkpoint Save implemented
MadMcCrow Dec 7, 2018
585800d
Documented Save Game system
MadMcCrow Dec 7, 2018
4600803
Merge branch 'Experimental' into LevelIntegration
Aljeune Dec 8, 2018
c6fea29
Post Experimental commit
Aljeune Dec 8, 2018
adc0188
Documentation and New HUD Widget Class
MadMcCrow Dec 8, 2018
c2d38e3
Merge remote-tracking branch 'origin/experimental' into LevelIntegration
Aljeune Dec 8, 2018
7dcd01d
HUD code improvement
MadMcCrow Dec 12, 2018
27e9e79
Merge remote-tracking branch 'origin/Experimental' into LevelIntegration
Aljeune Dec 12, 2018
e660751
Adding unfollowed files
Aljeune Dec 12, 2018
f0c0cb3
Merge experimental to level + adding stuff to the level for the lore
Aljeune Dec 12, 2018
8c9fbca
Work for 12-12-18
Aljeune Dec 13, 2018
1558399
Added Use Capabilites to Heroes.
MadMcCrow Dec 13, 2018
85b575c
+Introduction Ingame Sequence
Aljeune Dec 14, 2018
2c4e20b
Adding Julia !
Aljeune Dec 15, 2018
f600a5f
Retrieve Adding Julia commit+modify file to has no crash error (TArray)
Aljeune Dec 15, 2018
bea69a7
:WIP: working on Uusing Interactables and fixes
MadMcCrow Dec 15, 2018
4361797
Pre merge push for desactivation bp
Aljeune Dec 15, 2018
74c3656
2nd premerge
Aljeune Dec 15, 2018
2ebf00a
Merge remote-tracking branch 'origin/Experimental' into LevelIntegration
Aljeune Dec 15, 2018
2598b72
Pre merge commit 19.42
Aljeune Dec 16, 2018
71f637d
Update Artificial intelligence and Team interface
MadMcCrow Dec 16, 2018
2496b72
Merge remote-tracking branch 'origin/Experimental' into LevelIntegration
Aljeune Dec 16, 2018
398c3ba
Player and AI interaction updated
MadMcCrow Dec 16, 2018
c1a8bee
Adding Introduction cutscene
Aljeune Dec 16, 2018
61e417b
Merge remote-tracking branch 'refs/remotes/origin/Experimental'
Aljeune Dec 16, 2018
4c63b10
Added Cinematics and Animation for medusa
Aljeune Dec 16, 2018
af8ab48
Save 21.18
Aljeune Dec 17, 2018
087e5bd
AI Attack
MadMcCrow Dec 17, 2018
dac4650
Save 02.42
Aljeune Dec 17, 2018
69cbf88
Fixed not quitting bug
MadMcCrow Dec 17, 2018
1d99ee3
Before merge commit . added all residual files
Aljeune Dec 17, 2018
164d274
Merge remote-tracking branch 'origin/experimental' into LevelIntegration
Aljeune Dec 17, 2018
28c34a4
Post nmerge fixup
Aljeune Dec 17, 2018
215ecc8
Merge branch 'Experimental' into LevelIntegration
Aljeune Dec 17, 2018
ae85adb
Source Commit
MadMcCrow Jan 10, 2019
387e075
Push Post Vacation
Aljeune Jan 14, 2019
4fc3356
Updated AI
MadMcCrow Jan 16, 2019
1d1564d
~Vaga
Aljeune Jan 16, 2019
72f1151
fixed AI
MadMcCrow Jan 16, 2019
279d3e7
Save pre merge
Aljeune Jan 21, 2019
0ee4670
Merge remote-tracking branch 'refs/remotes/origin/Experimental'
Aljeune Jan 21, 2019
0337ee8
QuickUpdateAI
MadMcCrow Jan 21, 2019
6dca400
Save Pre merge #2
Aljeune Jan 21, 2019
8269d42
Merge remote-tracking branch 'origin/Experimental' into LevelIntegration
Aljeune Jan 22, 2019
7279cb4
fixed AI from origin/Experimental
Aljeune Jan 23, 2019
fdbe0ac
Correction of AI + Correction of use action + Dialogue System
Aljeune Jan 25, 2019
2577ebe
Add meshes + improve npc
Aljeune Jan 28, 2019
1ee519b
added function to modify Chamera placement on character
MadMcCrow Jan 29, 2019
a5cf5a1
Update for GameMode and Hero to allow for multiple camera placement
MadMcCrow Jan 31, 2019
241540f
Quick Fixes for interface call
Aljeune Jan 31, 2019
08a6879
Merge remote-tracking branch 'Origin/Experimental' into LevelIntegration
Aljeune Jan 31, 2019
dced452
Applying consecutive stashes
Aljeune Jan 31, 2019
a00d4b1
Applying stash 2
Aljeune Jan 31, 2019
ea659e3
Fix dialogs + add transition + landscape materials
Aljeune Feb 1, 2019
1aeb091
Add Bird + tweak in vaga
Aljeune Feb 4, 2019
5969741
WIP Platform phases tunnel + Improve UI design
Aljeune Feb 11, 2019
ebf16e1
WIP Created Game Module Third person
Aljeune Feb 12, 2019
baae757
Modified and completed Blueprint Class for Moving presses in level 3
Aljeune Feb 12, 2019
491a979
Succesfully added modules. Gameplay types separated
Aljeune Feb 17, 2019
035f602
Fixed Compile Errors
Aljeune Feb 17, 2019
294d59b
Third Level work and Main menu implementation
Aljeune Feb 19, 2019
80a95f4
Finish Level3
Aljeune Feb 22, 2019
aa5f1b8
updated classes, added climb
Aljeune Mar 7, 2019
a06ee9f
Push Pre test lvl 3
Aljeune Mar 30, 2019
1f8e695
april 6th commit. Settle all changes
Aljeune Apr 6, 2019
e8db4eb
April 25th commit : On the way to finish
Aljeune Apr 25, 2019
d097602
May 36rd Commit : still few bugs remain
Aljeune May 3, 2019
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
  •  
  •  
  •  
198 changes: 99 additions & 99 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
# Visual Studio 2015 user specific files
.vs/

#Clion user specific files
.idea/

.idea/Anima.iml
.idea/codeStyles/Project.xml
.idea/modules.xml
.idea/vcs.xml

# Cmake
cmake-build-release/
cmake-build-debug/


# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app
*.ipa

# These project files can be generated by the engine
*.xcodeproj
*.xcworkspace
*.sln
*.suo
*.opensdf
*.sdf
*.VC.db
*.VC.opendb

# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga

# Binary Files
Binaries/*
Plugins/*/Binaries/*

# Builds
Build/*

# Whitelist PakBlacklist-<BuildConfiguration>.txt files
!Build/*/
Build/*/**
!Build/*/PakBlacklist*.txt

# Don't ignore icon files in Build
!Build/**/*.ico

# Built data for maps
*_BuiltData.uasset

# Configuration files generated by the Editor
Saved/*

# Compiled source files for the engine to use
Intermediate/*
Plugins/*/Intermediate/*

# Cache files for the editor to use
DerivedDataCache/*

#Development Assets
Content/Dev/*
Content/Development/*
Content/Developers/*


#3d models
*.blend
*.spp
*.fbx
*.user
# Visual Studio 2015 user specific files
.vs/
#Clion user specific files
.idea/
.idea/Anima.iml
.idea/codeStyles/Project.xml
.idea/modules.xml
.idea/vcs.xml
# Cmake
cmake-build-release/
cmake-build-debug/
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
# These project files can be generated by the engine
*.xcodeproj
*.xcworkspace
*.sln
*.suo
*.opensdf
*.sdf
*.VC.db
*.VC.opendb
# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga
# Binary Files
Binaries/*
Plugins/*/Binaries/*
# Builds
Build/*
# Whitelist PakBlacklist-<BuildConfiguration>.txt files
!Build/*/
Build/*/**
!Build/*/PakBlacklist*.txt
# Don't ignore icon files in Build
!Build/**/*.ico
# Built data for maps
*_BuiltData.uasset
# Configuration files generated by the Editor
Saved/*
# Compiled source files for the engine to use
Intermediate/*
Plugins/*/Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*
#Development Assets
Content/Dev/*
Content/Development/*
Content/Developers/*
#3d models
*.blend
*.spp
*.fbx
*.user
2 changes: 2 additions & 0 deletions BuildTakahano.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
call "D:\PROJETS\TAKAHANO_PARIS\UnrealEngine\Engine\Build\BatchFiles\Build.bat" TakahanoParisEditor Win64 Development "D:\PROJETS\TAKAHANO_PARIS\Projet_Unreal\Takahano-Paris\TakahanoParis.uproject"
PAUSE
52 changes: 0 additions & 52 deletions CMakeLists.txt

This file was deleted.

4 changes: 2 additions & 2 deletions Config/DefaultEditor.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@


Loading