Commit Graph

Select branches

Hide Pull Requests

ShipSpawn

android

camera

camera2

develop2

emscription

escape001

fix/bullet-box-collision

linux

main

mephi1984

music-bar

network

new_cmake

planet-deep

sergey

spark

witcher001

witcher001-cutscene

witcher001-path

withcher001-items

Mono Color

• 1ac4c51a5d hotkesy for items Альберт Гадиев 2025-03-02 17:33:30 +0600
• a6a275a934 moving active inventory object maka70vv 2025-03-02 17:30:55 +0600
• 4ff416757f getting selected inventory items maka70vv 2025-03-02 17:16:22 +0600
• 37f0a6aa08
  Merge pull request #19 from mephi1984/Albert Albrut 2025-03-02 17:02:37 +0600
• 929c5aade1 working code Альберт Гадиев 2025-03-02 17:01:40 +0600
• ebc63e6663
  Merge pull request #18 from mephi1984/pavel Pavel Makarov 2025-03-02 16:49:50 +0600
• d35547560e
  Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 16:49:35 +0600
• 70f30b8b3a not worked version of inventory choosing maka70vv 2025-03-02 16:48:31 +0600
• bdf721ac15
  Merge pull request #17 from mephi1984/Albert Albrut 2025-03-02 16:31:22 +0600
• a15b74e7a9 fixed the staying at the air Альберт Гадиев 2025-03-02 16:28:45 +0600
• 980b8133a8
  Merge pull request #16 from mephi1984/Albert Albrut 2025-03-02 16:23:20 +0600
• 527315e976 now she stays on the ground i think Альберт Гадиев 2025-03-02 16:21:42 +0600
• d79a684868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 15:41:05 +0600
• 6fd0fc5868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-02 15:34:00 +0600
• fe88d27632 added first room Альберт Гадиев 2025-03-02 15:33:45 +0600
• 87032466ac Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 12:17:56 +0300
• aac2e84ad6 Change mouse logic Vladislav Khorev 2025-03-02 12:13:04 +0300
• b94bebdf0d updated inventory scale maka70vv 2025-03-02 15:11:45 +0600
• fa520b5df8
  Merge pull request #15 from mephi1984/pavel Pavel Makarov 2025-03-02 14:50:38 +0600
• 8657301da0 updated room mesh maka70vv 2025-03-02 14:49:26 +0600
• f816b5ada8
  Merge pull request #13 from mephi1984/pavel Pavel Makarov 2025-03-02 13:47:32 +0600
• 6ea9276495
  Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 13:47:25 +0600
• 8b07b6cc3f drawing hidden ui objects maka70vv 2025-03-02 13:45:29 +0600
• ac31c3bbf5 update rendering aictive objects as unordered_map maka70vv 2025-03-02 13:40:12 +0600
• a8a3b04b09 merge Vladislav Khorev 2025-03-02 09:37:49 +0300
• 15697ebe67 Adding walking animation, fixing minor bugs Vladislav Khorev 2025-03-02 09:29:31 +0300
• 2c26c5c0b5
  Merge pull request #12 from mephi1984/pavel Pavel Makarov 2025-03-02 11:30:19 +0600
• 8e5e96e3ee resolving conflicts by merge maka70vv 2025-03-02 11:28:16 +0600
• 6c25d1f06b active objects to unordered map maka70vv 2025-03-02 11:25:42 +0600
• d84e7904e6 missing file added Vladislav Khorev 2025-03-02 08:23:47 +0300
• dc01bdf12e mege Vladislav Khorev 2025-03-02 07:41:47 +0300
• 064d446aea Finally animation Vladislav Khorev 2025-03-02 07:37:51 +0300
• 4fd09212dd tested game logic maka70vv 2025-03-02 10:01:05 +0600
• 784da51a3f inventory to unordered map maka70vv 2025-03-02 09:55:56 +0600
• d46e5da520 added game logic class and lambda function for room maka70vv 2025-03-02 09:41:54 +0600
• b7f8a0f67a
  Merge pull request #11 from mephi1984/pavel Pavel Makarov 2025-03-02 03:10:39 +0600
• 1e3be66495 removing object from map after adding to inventory maka70vv 2025-03-02 03:10:01 +0600
• eb0bae44aa adding inventory maka70vv 2025-03-02 03:00:50 +0600
• aef61e19b4 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon maka70vv 2025-03-02 02:08:11 +0600
• a4aea4163a music changing maka70vv 2025-03-02 02:07:26 +0600
• 7616435e00
  Merge pull request #10 from mephi1984/pavel Pavel Makarov 2025-03-02 01:50:59 +0600
• 37e2c489a8
  Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 01:50:52 +0600
• 378c9c6d6d objects rendering by rooms maka70vv 2025-03-02 01:49:16 +0600
• 22ad0ebf98 tested room switching maka70vv 2025-03-02 01:01:10 +0600
• 5d31d8421f getting room texture by index maka70vv 2025-03-02 00:51:39 +0600
• 06cc639bb7 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon maka70vv 2025-03-01 23:53:54 +0600
• 74a2dc78a6 Fixing rooms maka70vv 2025-03-01 23:52:55 +0600
• 68b31cb197 merge Vladislav Khorev 2025-03-01 20:14:56 +0300
• 2a16970cde Fixing animation bugs Vladislav Khorev 2025-03-01 19:44:15 +0300
• 243dd61209 fixed default room size maka70vv 2025-03-01 19:56:59 +0600
• 1bf6d3f0b1 bugged room from class maka70vv 2025-03-01 19:43:36 +0600
• 5221b3a689
  Merge pull request #9 from mephi1984/Albert Albrut 2025-03-01 22:16:38 +0600
• 2d0c7ec166 added mouse handling Альберт Гадиев 2025-03-01 22:14:33 +0600
• 4c397eb3d0
  Merge pull request #8 from mephi1984/Albert Albrut 2025-03-01 21:44:44 +0600
• 4271ef556d Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-01 21:43:54 +0600
• 55133bbd87 fully refactored main.cpp Альберт Гадиев 2025-03-01 21:43:31 +0600
• 51a1cc742c refacored some parts of main.cpp Альберт Гадиев 2025-03-01 21:33:34 +0600
• 60380ee733
  Merge pull request #7 from mephi1984/Albert Albrut 2025-03-01 21:19:28 +0600
• b1954fd334 refacored some parts of main.cpp Альберт Гадиев 2025-03-01 21:13:53 +0600
• 641efaf582 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-01 20:54:15 +0600
• dbffcf5f04 refacored some parts of main.sh Альберт Гадиев 2025-03-01 20:53:11 +0600
• b6684f7929 refactored Альберт Гадиев 2025-03-01 19:22:19 +0600
• 0c431f9c08 Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-01 19:19:09 +0600
• e2af375aa0 starting refactoring main.cpp Альберт Гадиев 2025-03-01 19:18:42 +0600
• 666bfc1b37 added sh file for start in linux Альберт Гадиев 2025-03-01 19:16:26 +0600
• 436cf015a1
  Merge pull request #5 from mephi1984/Albert Albrut 2025-03-01 19:08:30 +0600
• b27b4adab3 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-01 19:07:06 +0600
• 613d809b43 deleted buttons for testing Альберт Гадиев 2025-03-01 19:06:42 +0600
• 880caecd97 added inventory testing buttons I to add items O to delete last items in inventory and p to get info about inventory Альберт Гадиев 2025-03-01 19:04:49 +0600
• 7dd2816409
  Merge pull request #4 from mephi1984/Albert Albrut 2025-03-01 18:40:53 +0600
• a8ab5015b9 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Abert Альберт Гадиев 2025-03-01 18:34:36 +0600
• 27ecda3124 added sounds and music in main cpp by cliking wasd or arrow will play sound of steps and music in setup start playing Альберт Гадиев 2025-03-01 18:20:50 +0600
• 43dd93a802
  Merge pull request #3 from mephi1984/Abert Albrut 2025-03-01 18:04:30 +0600
• bed5ae7a40 added sounds by clicking on button and changed script to compile Альберт Гадиев 2025-03-01 18:01:24 +0600
• b5877a488d Project windows Vladislav Khorev 2025-03-01 14:53:47 +0300
• 3fa844ddb9 missing textures Vladislav Khorev 2025-03-01 14:39:23 +0300
• 7249f30b71
  Merge pull request #2 from mephi1984/Abert Albrut 2025-03-01 17:28:17 +0600
• d9038fee44 added sounds library Альберт Гадиев 2025-03-01 17:26:04 +0600
• 098f2b4005 added sounds library Альберт Гадиев 2025-03-01 17:19:38 +0600
• 69a03cf524
  Merge pull request #1 from mephi1984/pavel Pavel Makarov 2025-03-01 17:09:45 +0600
• c6b8a52c6d Adding active objects Vladislav Khorev 2025-03-01 14:09:28 +0300
• f5cf579115 added inventory logic maka70vv 2025-03-01 17:08:49 +0600
• 64ec35415c Working with scene and projection Vladislav Khorev 2025-03-01 13:13:58 +0300
• 4a784036bd Working on model Vladislav Khorev 2025-03-01 11:45:16 +0300
• f5940c729c Working on status Vladislav Khorev 2025-03-01 10:19:37 +0300
• fa0a369357 Working with Windows also Vladislav Khorev 2025-03-01 10:14:28 +0300
• 8d8843cb11 linuc Альберт Гадиев 2025-03-01 11:44:31 +0600
• 0fd42529c7 Linux version Альберт Гадиев 2025-03-01 11:22:32 +0600
• 0a37ba49c3 fixing conflict Альберт Гадиев 2025-03-01 11:16:52 +0600
• b9e88547e6 linux part Альберт Гадиев 2025-03-01 11:12:22 +0600
• dfa5786f24 change path Vladislav Khorev 2025-03-01 07:53:49 +0300
• 407db412c7 added meshes with skeleton Vladislav Khorev 2025-03-01 07:52:56 +0300
• 4d2d35e34e Finally animation works Vladislav Khorev 2025-03-01 01:39:19 +0300
• 329f1b1663 Loading MD3 and now we need to place models properly Vladislav Khorev 2025-02-23 21:24:15 +0300
• e130c2ba7f Working with format md3 Vladislav Khorev 2025-02-23 15:44:28 +0300
• 3c40d3c20d Adding models Vladislav Khorev 2025-02-22 22:03:29 +0300
• 476a1e23f7 Working with obj model format Vladislav Khorev 2025-02-22 21:35:08 +0300
• 21301652ce Minor refactoring Vladislav Khorev 2025-02-22 21:04:23 +0300
• c792e50f1b Added color cube rotating in 3d Vladislav Khorev 2025-02-22 20:58:34 +0300
• 2876446ec8 2d is working, now try 3d Vladislav Khorev 2025-02-22 20:09:45 +0300