Commits · master · Oskar Keogh / WeeklyGameJam 165 · GitLab

Snippets Groups Projects

Sep 07, 2020
- final release · 44ec2586
  Tobias Ellefsen authored 4 years ago
  
  44ec2586
- last change to game scene · b3c3510b
  Tobias Ellefsen authored 4 years ago
  
  b3c3510b
- last player stat and collision changes before release · fa2230c2
  Tobias Ellefsen authored 4 years ago
  
  fa2230c2
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 into Prototype_Chat · 6d6d7692
  Tobias Ellefsen authored 4 years ago
  6d6d7692
- testing for merge · fb989399
  Tobias Ellefsen authored 4 years ago
  
  fb989399
- preparing for merge with chat function · 593aeed2
  Tobias Ellefsen authored 4 years ago
  
  593aeed2
- Clients will recieve message when other clients join, and clients can message... · 3ac0f909
  Tobias Ellefsen authored 4 years ago
  3ac0f909
Sep 06, 2020
- added background art, added tags for objects, added sorting layers, adjusted... · aa4adf9e
  GentixNtnu authored 4 years ago
  aa4adf9e
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 · f7a975c7
  Oskarok authored 4 years ago
  
  f7a975c7
- added jumping · a4bb2ad0
  Oskarok authored 4 years ago
  
  a4bb2ad0
- Fixed doingdmg func and die func. · 6cfe49e3
  fly_mann2 authored 4 years ago
  
  6cfe49e3
- Merge branch 'Prototype_fighting' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 · 00af97f7
  Oskarok authored 4 years ago
  
  00af97f7
- Scene changes · 59589746
  fly_mann2 authored 4 years ago
  
  59589746
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 · 928c2079
  fly_mann2 authored 4 years ago
  
  928c2079
- added test script and prefabs · eeede01b
  fly_mann2 authored 4 years ago
  
  eeede01b
- work on death · 07e548bc
  Oskarok authored 4 years ago
  
  07e548bc
- added player input on enter key and placed input and player object in same... · b5751baf
  Tobias Ellefsen authored 4 years ago
  b5751baf
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 · ee83883a
  Oskarok authored 4 years ago
  ee83883a
- merge · 438275de
  Oskarok authored 4 years ago
  
  438275de
- Fixed · f861f7e1
  fly_mann2 authored 4 years ago
  f861f7e1
- Small changes to player · 3ee8e562
  fly_mann2 authored 4 years ago
  
  3ee8e562
- pushing to master · 24731ad3
  Oskarok authored 4 years ago
  
  24731ad3
- attack · 6bb34680
  Oskarok authored 4 years ago
  
  6bb34680
- Merge branch 'Prototype_fighting' of... · 1413a572
  Oskarok authored 4 years ago
  1413a572
- attack changes · 5a4216b0
  Oskarok authored 4 years ago
  
  5a4216b0
- Fixed RpcChangeSprite. know all client can see the sprite change to a player · 36962f91
  fly_mann2 authored 4 years ago
  
  36962f91
- small Update to player script · 2d9d9f7e
  fly_mann2 authored 4 years ago
  
  2d9d9f7e
- attack · 006d64f3
  Oskarok authored 4 years ago
  
  006d64f3
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 ... · 6710e6b7
  Oskarok authored 4 years ago
  6710e6b7
- fighting · 61f64b20
  Oskarok authored 4 years ago
  
  61f64b20
- Player Script cleanup · df117343
  fly_mann2 authored 4 years ago
  
  df117343
Sep 05, 2020
- added a panel and text which pops up when clients join · 3c2e401a
  Tobias Ellefsen authored 4 years ago
  
  3c2e401a
- Added Alot of comments · cd2b0569
  fly_mann2 authored 4 years ago
  cd2b0569
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 ... · 5d4015a3
  fly_mann2 authored 4 years ago
  5d4015a3
- added state logic. client, server, brodcast, logic · af17bdba
  fly_mann2 authored 4 years ago
  
  af17bdba
- Merge branch 'master' of https://git.gvk.idi.ntnu.no/olkeogh/weeklygamejam-165 ... · e5ced3de
  Oskarok authored 4 years ago
  e5ced3de
- Work on attack · bb33e6c3
  Oskarok authored 4 years ago
  
  bb33e6c3
- Added 2d box coilder to player and ground · 5c3bdfc6
  fly_mann2 authored 4 years ago
  
  5c3bdfc6
- Fixed merge conflict with master: · b8e12039
  fly_mann2 authored 4 years ago
  b8e12039
- testing with menu · 201afbad
  Tobias Ellefsen authored 4 years ago
  
  201afbad