Commit graph

80 commits

Author SHA1 Message Date
cfe7914e70 Try Workflow
Some checks failed
Linux Export
2023-03-20 18:53:56 +00:00
89a77886c9 Try Workflow
Some checks failed
Linux Export
2023-03-20 18:52:48 +00:00
af67e18bb0 Try Workflow
All checks were successful
build-linux
2023-03-20 18:45:10 +00:00
34b851b321 Try Workflow 2023-03-20 18:42:22 +00:00
3a9031f527 Update Tileset 2023-02-05 21:40:59 +01:00
7f8ed4d7ec Fixed stones shadows on connections 2023-02-05 16:06:32 +01:00
4a7a0f59ca Recolored Used Tiles in Tileset to fit new Colorpallet 2023-02-05 15:46:24 +01:00
e3e1b67c31 Update ColorPallet.png and ColorPallet.tres 2023-02-05 15:27:27 +01:00
e151d2be84 Merge branch 'dev-resouces' 2023-02-05 14:41:13 +01:00
fe8bebd875 Merge branch 'dev-player' 2023-02-05 14:40:50 +01:00
a44accebe4 Adding GameManager 2023-02-04 20:18:47 +01:00
5b22a39a9d - Scale Movement by Delta Time
- Make Player Movement Damped
2023-02-04 20:02:29 +01:00
a2a78bcc29 Improved ColorPallet and added it in PNG format 2023-02-03 16:10:49 +01:00
9d54196f2e Adding ColorPallet.tres and DESIGN_GUIDELINES.md 2023-02-03 15:41:42 +01:00
9e3f0fc34a Made Enemy AI Follow
- added a Threshold of a Distance it Should keep
2023-02-03 15:17:51 +01:00
7826221624 Merge branch 'dev-base' 2023-02-03 13:54:47 +01:00
b90a210913 Add Code Linting Rules 2023-02-03 13:54:04 +01:00
6983001d45 Cleanup Code 2023-02-03 13:31:23 +01:00
5c52c04acb Cleanup Code 2023-02-02 23:09:00 +01:00
502d0c440d Reworked Enemy from scratch. Only Looking is done yet 2023-02-02 22:53:12 +01:00
093f6eb94e = fixed map colors on borders, added a prototype enemy wich currently has unexpected behavior, on collision he pulles the player with him. 2023-02-01 23:30:19 +01:00
2b8f5309f1 Merge pull request 'Merge pull request 'Merge pull request 'Improved Camera' (#22) from dev-player into dev-base' (#23) from dev-base into dev-player' (#25) from dev-player into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/25
2023-02-01 14:20:09 +00:00
4efe49303d Merge branch 'dev-base' into dev-player 2023-02-01 14:20:00 +00:00
da9e5a88fc Merge pull request 'Improved Tileset Colliders' (#24) from dev-resouces into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/24
2023-02-01 14:19:29 +00:00
11a3d5d4f4 Improved Tileset Colliders 2023-02-01 15:19:04 +01:00
2cc7faea0e Merge pull request 'Merge pull request 'Improved Camera' (#22) from dev-player into dev-base' (#23) from dev-base into dev-player
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/23
2023-02-01 14:07:26 +00:00
c5196c7699 Merge pull request 'Improved Camera' (#22) from dev-player into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/22
2023-02-01 14:05:41 +00:00
f7c87d9fe4 Merge branch 'dev-player' of http://git.euph.dev/GameDev/2DHackAndSlay.git 2023-02-01 15:05:23 +01:00
ee1e76dd0e Improving Camera 2023-02-01 15:05:18 +01:00
159c8c91cd Merge pull request 'Upgraded Tileset' (#21) from dev-resouces into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/21
2023-02-01 14:03:11 +00:00
f7fb279872 Implemented Upgraded Tileset 2023-02-01 15:02:16 +01:00
655fc6102e Improve Tileset 2023-02-01 14:42:29 +01:00
df5de9476a Improving Camera 2023-02-01 13:28:53 +01:00
8f08e59835 Merge pull request 'Merge pull request 'dev-base' (#16) from dev-base into dev-player' (#19) from dev-player into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/19
2023-02-01 08:50:24 +00:00
74e2a42b83 Merge pull request 'Merge pull request 'dev-base' (#17) from dev-base into dev-resouces' (#18) from dev-resouces into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/18
2023-02-01 08:50:03 +00:00
b1bcf8971b Merge pull request 'dev-base' (#17) from dev-base into dev-resouces
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/17
2023-02-01 08:47:57 +00:00
30d614301f Merge pull request 'dev-base' (#16) from dev-base into dev-player
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/16
2023-02-01 08:47:36 +00:00
0df52fa571 Merge pull request 'Improved Tileset' (#15) from dev-scene into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/15
2023-02-01 08:47:10 +00:00
f675567540 Improved Tileset
- Fixed Red Version
- Added more Edgecases
- Added Connectioon type that allows to connect red and blu
2023-02-01 09:46:04 +01:00
3d9dfa4b5d Basic 4 Movement with static Camera Following 2023-02-01 08:21:08 +01:00
770b115ad4 Merge pull request 'DEV: Fix Project File' (#14) from dev-base into dev-player
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/14
2023-02-01 06:38:47 +00:00
39cfa7d3fd Merge branch 'dev-player' into dev-base 2023-02-01 06:38:38 +00:00
bb109e1be2 Fix Project File 2023-02-01 07:25:25 +01:00
3cc4aa725e Merge pull request 'Dev: Cascade Changes' (#13) from dev-base into dev-player
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/13
2023-01-31 16:07:55 +00:00
cdc4b1c341 Merge pull request 'Dev: Improved Tileset' (#12) from dev-scene into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/12
2023-01-31 15:05:23 +00:00
7f38c8df93 Improved Tileset 2023-01-31 16:03:29 +01:00
adb9765f43 Merge pull request 'Dev: Improved Testing Scene with better Tilemap' (#11) from dev-scene into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/11
2023-01-31 13:24:38 +00:00
0cb590a333 removed edit file of tileset 2023-01-31 14:23:55 +01:00
db3b9271e6 Improving Tilemap 2023-01-31 14:22:09 +01:00
7db9bd6dfd Merge pull request 'Resolve Conflicts' (#10) from dev-scene into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/10
2023-01-31 11:43:27 +00:00