shadow-over-bishkek001

salmon-engine-projects/shadow-over-bishkek001

0 Fork 0

Commit Graph

Select branches

Hide Pull Requests

ShipSpawn

android

android2

camera

camera2

demo2026-09-30

develop2

emscription

escape001

fix/bullet-box-collision

linux

main

mephi1984

music-bar

network

networking

new_cmake

planet-deep

release002

sergey

spark

tutorial-refactor

witcher001

witcher001-cutscene

witcher001-linux

witcher001-path

withcher001-items

2ef2e456f7 GPU skinning refactoring Vladislav Khorev 2026-04-16 17:48:23 +03:00
83cceecccd Refactoring Vladislav Khorev 2026-04-16 15:37:48 +03:00
24851a89e8 Merge Vladislav Khorev 2026-04-16 15:16:45 +03:00
d47cfd1b6b Minor refactoring Vladislav Khorev 2026-04-16 15:07:59 +03:00
71346b4227 Remove unused files Vladislav Khorev 2026-04-16 14:03:52 +03:00
08e1174eaf Fixing minor bugs Vladislav Khorev 2026-04-16 13:44:40 +03:00
cc2eba1352 merge Vladislav Khorev 2026-04-16 13:24:04 +03:00
cfee60d71a merge Vladislav Khorev 2026-04-16 13:11:01 +03:00
dc76986cd3 Added path showing Vladislav Khorev 2026-04-16 11:39:14 +03:00
61665434ab Fixing minor bugs Vladislav Khorev 2026-04-16 09:37:36 +03:00
2494a44e4a refactor: switch cutscene camera to viewport/UV-based system vottozi 2026-04-16 01:29:01 +06:00
d8795ec076 Added shadow maps Vladislav Khorev 2026-04-15 19:54:21 +03:00
ceebb13719 improve dialogue advance and add flexible cutscene camera system vottozi 2026-04-15 20:42:41 +06:00
a47306533e Working on stuff Vladislav Khorev 2026-04-15 16:51:55 +03:00
f708843747 Working on optimization: GPU skinning and binary animations Vladislav Khorev 2026-04-15 16:39:33 +03:00
a589765b7e prepare to add anims Vladislav Khorev 2026-04-15 16:38:30 +03:00
4eaefd25d4 added finding path with A* and json file to know where character can walk anime 2026-04-15 18:36:27 +06:00
eff7322140 Working on dialog portraits Vladislav Khorev 2026-04-15 11:56:38 +03:00
44dd09fcb5 fix inventory Vlad 2026-04-15 14:50:46 +06:00
de2e18e38f Fixing rotation issues in battle mode Vladislav Khorev 2026-04-15 10:34:55 +03:00
984d7489d5 Working on enemies and attack Vladislav Khorev 2026-04-15 10:00:16 +03:00
f7e6f063d1 added dialog start radius and background by time in cutscenes Vlad 2026-04-14 18:07:46 +06:00
db8b9b7a18 fix timetyper and dialog start by click on npc Vlad 2026-04-14 17:41:28 +06:00
493eb5a5d7 Working on battle animation Vladislav Khorev 2026-04-13 23:19:03 +03:00
422ff1fbe3 merge Vlad 2026-04-13 15:08:38 +06:00
6465549c3b fix: dialogue text now displays correctly vottozi 2026-04-13 02:16:25 +06:00
34759326b9 added npc's gift Vlad 2026-04-12 14:52:37 +06:00
7125674308 add dialogue and cutscene system vottozi 2026-04-12 01:46:33 +06:00
bc2997d86f added activeFunc for active obj Vlad 2026-04-11 16:18:59 +06:00
943b6b4d21 added load npcs from json Vlad 2026-04-11 15:30:29 +06:00
b3fda88784 added inventory & active object Vlad 2026-04-09 15:33:55 +06:00
e1b491be73 added load from json game objects Vlad 2026-04-07 20:17:04 +06:00
178f69967b Working on web, change python to lua Vladislav Khorev 2026-04-04 14:29:20 +03:00
90e2a369f4 Added attack animation for ghots Vladislav Khorev 2026-04-03 21:54:40 +03:00
403b93e7f5 Added more scripts Vladislav Khorev 2026-04-03 20:06:33 +03:00
63c9d7b35b Adding scripts Vladislav Khorev 2026-04-03 19:46:43 +03:00
995e2c8e5b NPC code Vladislav Khorev 2026-04-02 21:03:55 +03:00
2e4a7ab467 Some cleanup Vladislav Khorev 2026-04-02 19:24:15 +03:00
a96d0b207a Added ai generated animation Vladislav Khorev 2026-04-01 19:07:21 +03:00
7840bfdb4e Added viola Vladislav Khorev 2026-04-01 13:02:39 +03:00
56ce826205 Remove unused references Vladislav Khorev 2026-04-01 12:03:35 +03:00
5364b97235 Working on new scene Vladislav Khorev 2026-04-01 12:03:16 +03:00
8e928a34c2 Started to fix collision fix/bullet-box-collision anime 2026-03-14 22:40:45 +06:00
54c71536b1 Merge branch 'main' into linux linux Vladislav Khorev 2026-03-12 08:39:43 +00:00
beac06fd45 Production-ready, fixing server bugs Vladislav Khorev 2026-03-12 11:36:47 +03:00
ca98fea2bd Fixing stupid bug Vladislav Khorev 2026-03-10 22:09:07 +03:00
84b3c3261c Merge branch 'main' into linux Vladislav Khorev 2026-03-10 18:41:47 +00:00
a4d5017270 Remove log Vladislav Khorev 2026-03-10 21:40:58 +03:00
45826ab5b5 Minor changes in config Vladislav Khorev 2026-03-10 21:39:05 +03:00
d1f3d67062 Merge branch 'main' into linux Vladislav Khorev 2026-03-10 18:18:03 +00:00
e5296a41b9 Added help and about, minor improvements Vladislav Khorev 2026-03-10 21:16:58 +03:00
18674efd8e Working on minor bug fixing Vladislav Khorev 2026-03-10 18:03:16 +03:00
5e7c050c68 Merge branch 'spark' Vladislav Khorev 2026-03-10 11:39:02 +03:00
c88784a669 Added inverse, fixing server bug Vladislav Khorev 2026-03-10 11:38:16 +03:00
181132e092 merge spark Vlad 2026-03-10 14:36:35 +06:00
6fe10eacfc Merge remote-tracking branch 'origin/main' into spark Vlad 2026-03-10 14:26:51 +06:00
9e692c9ec3 added enter nicknamw Vlad 2026-03-10 14:25:00 +06:00
3094fc6112 Merge branch 'main' into linux Vladislav Khorev 2026-03-09 20:06:00 +00:00
785b96ce82 Working on list of players Vladislav Khorev 2026-03-09 23:04:48 +03:00
a8ded217df Fixing ui bugs Vladislav Khorev 2026-03-09 20:52:16 +03:00
9e6ff5e08f Merge branch 'main' into linux Vladislav Khorev 2026-03-09 16:28:12 +00:00
3e8dba36a4 fixing minor bugs, fixing velocity not changed after death, fixing server crash Vladislav Khorev 2026-03-09 19:27:20 +03:00
24526efb8d gitMerge branch 'main' into linux Vladislav Khorev 2026-03-09 15:37:39 +00:00
84a5e888a0 Added pickup boxes Vladislav Khorev 2026-03-09 18:36:04 +03:00
e5d7885a12 Merge branch 'main' into linux Vladislav Khorev 2026-03-09 10:52:04 +00:00
86a9f38c3b Some UI changes Vladislav Khorev 2026-03-09 13:50:59 +03:00
24aa7007bb Added trails to other ships toos Vladislav Khorev 2026-03-08 21:27:45 +03:00
59b5bea540 Fixing particles sergey ShipSpawn Vladislav Khorev 2026-03-08 19:07:02 +03:00
9da3cc4401 Fixing bug in particle emitter Vladislav Khorev 2026-03-08 00:22:13 +03:00
4a542fd6c8 Added multi-touch, added on press down Vladislav Khorev 2026-03-07 22:41:25 +03:00
a06cb77a66 Fixing minor stuff, refactoring Vladislav Khorev 2026-03-07 20:51:34 +03:00
3c2c06ca40 Working on refactoring Vladislav Khorev 2026-03-07 20:03:16 +03:00
928600acd4 Refactoring Vladislav Khorev 2026-03-07 19:41:15 +03:00
7ccda081b0 Fixing bugs Vladislav Khorev 2026-03-06 23:15:56 +03:00
41f370f2ee Minor fixing Vladislav Khorev 2026-03-06 22:34:03 +03:00
4af20c65e6 Make menu to state machine Vladislav Khorev 2026-03-06 21:52:00 +03:00
d151d4bfaf Merge branch 'main' into linux Vladislav Khorev 2026-03-06 17:06:42 +00:00
ac551122d9 Added force disconnect from server Vladislav Khorev 2026-03-06 20:05:55 +03:00
8528b4dc90 Clean up server Vladislav Khorev 2026-03-06 19:08:55 +03:00
c35e093cc5 Working on encoding Vladislav Khorev 2026-03-06 17:51:46 +03:00
a8c76dee3c Working on fixing minor bugs Vladislav Khorev 2026-03-05 23:58:35 +03:00
e84a094ad9 Merge branch 'spark' Vladislav Khorev 2026-03-05 19:54:24 +03:00
b0b7391939 Fixed low quality Vladislav Khorev 2026-03-05 19:53:27 +03:00
3e2632c5b5 added textures Vlad 2026-03-05 20:14:02 +06:00
147aa266d5 Merge branch 'linux' into ShipSpawnLinux Vladislav Khorev 2026-03-05 07:28:05 +00:00
70ef730e86 Merge branch 'main' into ShipSpawn Vladislav Khorev 2026-03-05 10:24:17 +03:00
92b288d978 fixing bugs Vladislav Khorev 2026-03-05 10:15:55 +03:00
2884865b53 Merge branch 'main' into linux Vladislav Khorev 2026-03-05 06:41:04 +00:00
cca1d0ece2 Merge branch 'spark' Vladislav Khorev 2026-03-05 09:10:38 +03:00
8effdd5dfa Merge branch 'sergey' Vladislav Khorev 2026-03-05 09:10:00 +03:00
e78429b600 Working on running the game even in Telegram Vladislav Khorev 2026-03-04 21:41:51 +03:00
05a13a40e7 fixed: Box destroition anime 2026-03-04 16:37:00 +06:00
ef7617701e fix server collision radius mismatch vottozi 2026-03-04 03:37:58 +06:00
2f50dc1522 fix Lead Indicator rendering when target off-screen vottozi 2026-03-04 01:42:57 +06:00
9eafcd27fb Fix lead indicator prediction & align projectile lifetime (client/server) vottozi 2026-03-03 19:42:08 +06:00
3879eb1d75 fixed web ship types boxes / local boxes collision and projectiles Vlad 2026-03-03 19:17:07 +06:00
78046e5e2d Merge remote-tracking branch 'origin/main' into ShipSpawn anime 2026-03-02 17:49:09 +06:00
26233f934f fixed: spawning ships anime 2026-03-02 17:47:46 +06:00
167c04b107 install Vlad 2026-03-02 14:05:23 +06:00
a1a7f714d9 Merge branch 'main' into linux Vladislav Khorev 2026-03-01 19:40:48 +00:00

... 2 3 4 5 6 ...