Commits · master · Hall of Fame / Utopia

Jun 03, 2023
- moving · aa446d40
  Zhang Li authored 1 year ago
  
  View commits for tag v1.0 v1.0
  
  aa446d40
May 25, 2023
- Merge branch 'rendre-game-engine' into 'master' · 07215418
  Rendre Johann Greyling authored 1 year ago
  
  Final changes See merge request software-technology-2023/group-1/utopia!81
  07215418
- Final changes · 36bd494c
  Rendre authored 1 year ago
  
  36bd494c
- Update README.md · d06f70fc
  Rendre Johann Greyling authored 1 year ago
  
  d06f70fc
- Merge branch 'rendre-game-engine' into 'master' · c99cad97
  Rendre Johann Greyling authored 1 year ago
  
  Add extra image See merge request software-technology-2023/group-1/utopia!80
  c99cad97
- Add extra image · 5a10675c
  Rendre authored 1 year ago
  
  5a10675c
- Update README.md · 9bcbaf7a
  Rendre Johann Greyling authored 1 year ago
  
  9bcbaf7a
- Update README.md · ba62440f
  Rendre Johann Greyling authored 1 year ago
  
  ba62440f
- Update README.md · aefbd78c
  Rendre Johann Greyling authored 1 year ago
  
  aefbd78c
May 24, 2023
- Merge branch 'rendre-game-engine' into 'master' · 87b3a478
  Rendre Johann Greyling authored 1 year ago
  
  Finishing touches to game See merge request software-technology-2023/group-1/utopia!79
  87b3a478
- Remove warnings · d605071a
  Zhang Li authored 1 year ago
  
  d605071a
- Removed unnecessary files, main. Added database test · 9bef866b
  Zhang Li authored 1 year ago
  
  9bef866b
- Merge branch 'master' of... · 251502ea
  Rendre authored 1 year ago
  
  Merge branch 'master' of https://szofttech.inf.elte.hu/software-technology-2023/group-1/utopia into rendre-game-engine
  251502ea
- Slight change to handler · b9ec355d
  Rendre authored 1 year ago
  
  b9ec355d
- Slight change to pause menu to close with ESC key as well · 70ffa44f
  Rendre authored 1 year ago
  
  70ffa44f
- Start of Main Menu · 9a2b00ce
  Rendre authored 1 year ago
  
  9a2b00ce
- Added java doc · df3d124a
  Zhang Li authored 1 year ago
  
  df3d124a
- Fixed satisfaction lower than 0 · 83062c22
  Zhang Li authored 1 year ago
  
  83062c22
- Fixed satisfaction lower than 0 · ac123bb5
  Zhang Li authored 1 year ago
  
  ac123bb5
- Merge remote-tracking branch 'origin/master' · 33b81409
  Zhang Li authored 1 year ago
  
  33b81409
- Finished HumanManufacture document. · 6fc8e560
  Zhang Li authored 1 year ago
  
  6fc8e560
- Fix merge conflict · b3467bab
  Rendre authored 1 year ago
  
  b3467bab
- Documentation and clean up of handler · 7fcd4f9d
  Rendre authored 1 year ago
  
  7fcd4f9d
- Merge branch 'aziz-game-engine' into 'master' · a45cc11e
  Abdelaziz Dhaouadi authored 1 year ago
  
  Fixed a slight bug See merge request software-technology-2023/group-1/utopia!78
  a45cc11e
- Fixed a slight bug · 766a6a69
  Abdelaziz Dhaouadi authored 1 year ago
  
  766a6a69
- Merge branch 'aziz-game-engine' into 'master' · be846b70
  Abdelaziz Dhaouadi authored 1 year ago
  
  Exiting the game is working with game over feature See merge request software-technology-2023/group-1/utopia!77
  be846b70
- Fixed merge conflict · 1f6589cc
  Rendre authored 1 year ago
  
  1f6589cc
- Fixed merge conflict · 87ea7f6a
  Rendre authored 1 year ago
  
  87ea7f6a
- Exiting the game is working with game over feature · aab62235
  Abdelaziz Dhaouadi authored 1 year ago
  
  aab62235
- Change camera position and added hide hud feature · 0e3ce1dc
  Rendre authored 1 year ago
  
  0e3ce1dc
- Selector size now changes depending on the asset type · 9dff62c0
  Rendre authored 1 year ago
  
  9dff62c0
- Add asset for construction · 8ef6d1e7
  Rendre authored 1 year ago
  
  8ef6d1e7
- Merge branch 'aziz-game-engine' into 'master' · 02785e55
  Rendre Johann Greyling authored 1 year ago
  
  Fixed a bug with the pause from bottom bar and resume from menu See merge request software-technology-2023/group-1/utopia!76
  02785e55
- Fixed a bug with the pause from bottom bar and resume from menu · fdccb081
  Abdelaziz Dhaouadi authored 1 year ago
  
  fdccb081
- Change to grass texture, increase in size of map and change to road object · 98e31c95
  Rendre authored 1 year ago
  
  98e31c95
- Merge branch 'aziz-game-engine' into 'master' · 53dc4d74
  Rendre Johann Greyling authored 1 year ago
  
  Fixed the save button in the Pause Menu See merge request software-technology-2023/group-1/utopia!75
  53dc4d74
- Fixed the save button in the Pause Menu · 21e05ef0
  Abdelaziz Dhaouadi authored 1 year ago
  
  21e05ef0
- Merge branch 'master' of... · 4c5e1d2e
  Rendre authored 1 year ago
  
  Merge branch 'master' of https://szofttech.inf.elte.hu/software-technology-2023/group-1/utopia into rendre-game-engine
  4c5e1d2e
- Add assets for forest and implemented age change in engine · 0edcfb85
  Rendre authored 1 year ago
  
  0edcfb85
- Merge remote-tracking branch 'origin/master' · f1a4135b
  Zhang Li authored 1 year ago
  
  f1a4135b