Commit Graph

319 Commits

Author SHA1 Message Date
Vladislav Khorev
3495d28edf Fixing minor bugs 2026-04-25 20:30:27 +03:00
Vladislav Khorev
c7b3f04cd4 Working on fog, 2nd level, locations, dialogs 2026-04-25 19:56:00 +03:00
Vladislav Khorev
eac914e073 minor fixing, adapting for mobile web 2026-04-25 14:39:27 +03:00
Vladislav Khorev
44cc0fba67 Added hp and attack actions, and labels 2026-04-25 12:07:52 +03:00
0a073243ad safe LMB hold-to-skip cutscenes and multiple images with crossfade 2026-04-25 01:32:16 +06:00
Vladislav Khorev
393ebcd831 Added sparks 2026-04-24 19:53:18 +03:00
Vladislav Khorev
2bb7da2e37 Added hp 2026-04-24 18:40:51 +03:00
Vladislav Khorev
b4b41e8620 Added more animations 2026-04-24 17:39:32 +03:00
Vladislav Khorev
3241ab3735 Working on more animations 2026-04-23 22:24:33 +03:00
Vladislav Khorev
c655678486 Some strange shit happens 2026-04-22 22:38:20 +03:00
Vladislav Khorev
4d9a5b0a6e Set new type of animation 2026-04-22 20:45:40 +03:00
Vladislav Khorev
52c4ad8ee0 Working on new animations 2026-04-22 18:53:27 +03:00
Vladislav Khorev
b6e0422d71 Working on audio in web part 1 2026-04-17 17:13:55 +03:00
Vladislav Khorev
3778a603f2 merge 2026-04-17 16:30:09 +03:00
Vladislav Khorev
e310822462 Working on web version 2026-04-17 16:13:56 +03:00
Vladislav Khorev
3d3c3b2a36 merge 2026-04-17 13:42:45 +03:00
Vlad
b5bcd3a812 added music 2026-04-17 14:23:56 +06:00
16e7580418 Merge branch 'witcher001-cutscene' of gitea.fishrungames.com:salmon-engine-projects/space-game001 into witcher001-cutscene 2026-04-17 02:33:56 +06:00
be4dcd4cf9 fix: make choice options the only clickable area in dialogue choices 2026-04-17 02:04:36 +06:00
Vladislav Khorev
a1dda3fd50 Major refactoring 2026-04-16 20:24:27 +03:00
Vladislav Khorev
92ba3f2b60 Some refactoring 2026-04-16 20:06:03 +03:00
Vladislav Khorev
f2f56125f0 Refactoring 2026-04-16 18:07:22 +03:00
Vladislav Khorev
2ef2e456f7 GPU skinning refactoring 2026-04-16 17:48:23 +03:00
Vladislav Khorev
83cceecccd Refactoring 2026-04-16 15:37:48 +03:00
Vladislav Khorev
24851a89e8 Merge 2026-04-16 15:16:45 +03:00
Vladislav Khorev
d47cfd1b6b Minor refactoring 2026-04-16 15:07:59 +03:00
Vladislav Khorev
08e1174eaf Fixing minor bugs 2026-04-16 13:44:40 +03:00
Vladislav Khorev
cc2eba1352 merge 2026-04-16 13:24:04 +03:00
Vladislav Khorev
cfee60d71a merge 2026-04-16 13:11:01 +03:00
Vladislav Khorev
dc76986cd3 Added path showing 2026-04-16 11:39:14 +03:00
Vladislav Khorev
61665434ab Fixing minor bugs 2026-04-16 09:37:36 +03:00
2494a44e4a refactor: switch cutscene camera to viewport/UV-based system 2026-04-16 01:29:01 +06:00
Vladislav Khorev
d8795ec076 Added shadow maps 2026-04-15 19:54:21 +03:00
ceebb13719 improve dialogue advance and add flexible cutscene camera system 2026-04-15 20:42:41 +06:00
Vladislav Khorev
f708843747 Working on optimization: GPU skinning and binary animations 2026-04-15 16:39:33 +03:00
4eaefd25d4 added finding path with A* and json file to know where character can walk 2026-04-15 18:36:27 +06:00
Vladislav Khorev
eff7322140 Working on dialog portraits 2026-04-15 11:56:38 +03:00
Vlad
44dd09fcb5 fix inventory 2026-04-15 14:50:46 +06:00
Vladislav Khorev
de2e18e38f Fixing rotation issues in battle mode 2026-04-15 10:34:55 +03:00
Vladislav Khorev
984d7489d5 Working on enemies and attack 2026-04-15 10:00:16 +03:00
Vlad
f7e6f063d1 added dialog start radius and background by time in cutscenes 2026-04-14 18:07:46 +06:00
Vlad
db8b9b7a18 fix timetyper and dialog start by click on npc 2026-04-14 17:41:28 +06:00
Vladislav Khorev
493eb5a5d7 Working on battle animation 2026-04-13 23:19:03 +03:00
Vlad
422ff1fbe3 merge 2026-04-13 15:08:38 +06:00
6465549c3b fix: dialogue text now displays correctly 2026-04-13 02:16:25 +06:00
Vlad
34759326b9 added npc's gift 2026-04-12 14:52:37 +06:00
7125674308 add dialogue and cutscene system 2026-04-12 01:46:33 +06:00
Vlad
bc2997d86f added activeFunc for active obj 2026-04-11 16:18:59 +06:00
Vlad
943b6b4d21 added load npcs from json 2026-04-11 15:30:29 +06:00
Vlad
b3fda88784 added inventory & active object 2026-04-09 15:33:55 +06:00
Vlad
e1b491be73 added load from json game objects 2026-04-07 20:17:04 +06:00
Vladislav Khorev
178f69967b Working on web, change python to lua 2026-04-04 14:29:20 +03:00
Vladislav Khorev
90e2a369f4 Added attack animation for ghots 2026-04-03 21:54:40 +03:00
Vladislav Khorev
403b93e7f5 Added more scripts 2026-04-03 20:06:33 +03:00
Vladislav Khorev
63c9d7b35b Adding scripts 2026-04-03 19:46:43 +03:00
Vladislav Khorev
995e2c8e5b NPC code 2026-04-02 21:03:55 +03:00
Vladislav Khorev
2e4a7ab467 Some cleanup 2026-04-02 19:24:15 +03:00
Vladislav Khorev
a96d0b207a Added ai generated animation 2026-04-01 19:07:21 +03:00
Vladislav Khorev
7840bfdb4e Added viola 2026-04-01 13:02:39 +03:00
Vladislav Khorev
5364b97235 Working on new scene 2026-04-01 12:03:16 +03:00
Vladislav Khorev
beac06fd45 Production-ready, fixing server bugs 2026-03-12 11:36:47 +03:00
Vladislav Khorev
ca98fea2bd Fixing stupid bug 2026-03-10 22:09:07 +03:00
Vladislav Khorev
a4d5017270 Remove log 2026-03-10 21:40:58 +03:00
Vladislav Khorev
45826ab5b5 Minor changes in config 2026-03-10 21:39:05 +03:00
Vladislav Khorev
e5296a41b9 Added help and about, minor improvements 2026-03-10 21:16:58 +03:00
Vladislav Khorev
18674efd8e Working on minor bug fixing 2026-03-10 18:03:16 +03:00
Vladislav Khorev
5e7c050c68 Merge branch 'spark' 2026-03-10 11:39:02 +03:00
Vladislav Khorev
c88784a669 Added inverse, fixing server bug 2026-03-10 11:38:16 +03:00
Vlad
181132e092 merge 2026-03-10 14:36:35 +06:00
Vlad
6fe10eacfc Merge remote-tracking branch 'origin/main' into spark 2026-03-10 14:26:51 +06:00
Vlad
9e692c9ec3 added enter nicknamw 2026-03-10 14:25:00 +06:00
Vladislav Khorev
785b96ce82 Working on list of players 2026-03-09 23:04:48 +03:00
Vladislav Khorev
a8ded217df Fixing ui bugs 2026-03-09 20:52:16 +03:00
Vladislav Khorev
3e8dba36a4 fixing minor bugs, fixing velocity not changed after death, fixing server crash 2026-03-09 19:27:20 +03:00
Vladislav Khorev
84a5e888a0 Added pickup boxes 2026-03-09 18:36:04 +03:00
Vladislav Khorev
86a9f38c3b Some UI changes 2026-03-09 13:50:59 +03:00
Vladislav Khorev
24aa7007bb Added trails to other ships toos 2026-03-08 21:27:45 +03:00
Vladislav Khorev
59b5bea540 Fixing particles 2026-03-08 19:07:02 +03:00
Vladislav Khorev
9da3cc4401 Fixing bug in particle emitter 2026-03-08 00:22:13 +03:00
Vladislav Khorev
4a542fd6c8 Added multi-touch, added on press down 2026-03-07 22:41:25 +03:00
Vladislav Khorev
a06cb77a66 Fixing minor stuff, refactoring 2026-03-07 20:51:34 +03:00
Vladislav Khorev
3c2c06ca40 Working on refactoring 2026-03-07 20:03:16 +03:00
Vladislav Khorev
928600acd4 Refactoring 2026-03-07 19:41:15 +03:00
Vladislav Khorev
7ccda081b0 Fixing bugs 2026-03-06 23:15:56 +03:00
Vladislav Khorev
41f370f2ee Minor fixing 2026-03-06 22:34:03 +03:00
Vladislav Khorev
4af20c65e6 Make menu to state machine 2026-03-06 21:52:00 +03:00
Vladislav Khorev
ac551122d9 Added force disconnect from server 2026-03-06 20:05:55 +03:00
Vladislav Khorev
c35e093cc5 Working on encoding 2026-03-06 17:51:46 +03:00
Vladislav Khorev
a8c76dee3c Working on fixing minor bugs 2026-03-05 23:58:35 +03:00
Vladislav Khorev
b0b7391939 Fixed low quality 2026-03-05 19:53:27 +03:00
Vladislav Khorev
70ef730e86 Merge branch 'main' into ShipSpawn 2026-03-05 10:24:17 +03:00
Vladislav Khorev
92b288d978 fixing bugs 2026-03-05 10:15:55 +03:00
Vladislav Khorev
cca1d0ece2 Merge branch 'spark' 2026-03-05 09:10:38 +03:00
Vladislav Khorev
8effdd5dfa Merge branch 'sergey' 2026-03-05 09:10:00 +03:00
Vladislav Khorev
e78429b600 Working on running the game even in Telegram 2026-03-04 21:41:51 +03:00
05a13a40e7 fixed: Box destroition 2026-03-04 16:37:00 +06:00
2f50dc1522 fix Lead Indicator rendering when target off-screen 2026-03-04 01:42:57 +06:00
9eafcd27fb Fix lead indicator prediction & align projectile lifetime (client/server) 2026-03-03 19:42:08 +06:00
Vlad
3879eb1d75 fixed web ship types boxes / local boxes collision and projectiles 2026-03-03 19:17:07 +06:00
78046e5e2d Merge remote-tracking branch 'origin/main' into ShipSpawn 2026-03-02 17:49:09 +06:00
26233f934f fixed: spawning ships 2026-03-02 17:47:46 +06:00
Vladislav Khorev
70a617b688 More changes 2026-03-01 22:34:12 +03:00
Vladislav Khorev
bb0f584bf6 Working on UI and web game 2026-03-01 21:22:57 +03:00
Vladislav Khorev
6b4b549b3c Working on UI for web 2026-02-28 23:01:26 +03:00
Vladislav Khorev
ffbecbbcde Working on ui 2026-02-28 22:21:08 +03:00
Vladislav Khorev
2728ca9646 Adapting web version 2026-02-28 20:37:47 +03:00
Vladislav Khorev
7e5aa22fee merge 2026-02-28 13:33:33 +03:00
Vlad
c20e82634a fix game over 2026-02-28 12:07:40 +06:00
Vladislav Khorev
9f82e7a2e6 Adapt for web 2026-02-27 22:31:07 +03:00
Vlad
7418bbbe27 fix spaceship rotation fix sync boxes 2026-02-27 17:37:00 +06:00
Vladislav Khorev
be2aa76f8b Working on server optimization 2026-02-26 22:26:43 +03:00
Vladislav Khorev
e8f1786a2a merge 2026-02-26 21:22:38 +03:00
Vladislav Khorev
e30f8a4c70 merge 2026-02-26 21:10:27 +03:00
Vladislav Khorev
f8642efa23 merge 2026-02-26 21:02:16 +03:00
5da5a754fe add configurable HUD crosshair 2026-02-26 01:49:49 +06:00
fb1b0a1c2e Lead Indicator fix 2026-02-25 22:18:47 +06:00
Vlad
74c2f786a1 added choising spaceship type for multiplayer and some fix in respawn 2026-02-25 19:17:42 +06:00
Vlad
5216965496 added choosing spaceship in singleplay 2026-02-24 20:34:01 +06:00
Vlad
ad7294ceea added random spaceship type 2026-02-24 19:51:33 +06:00
Vlad
3893038d9a Merge remote-tracking branch 'origin/main' into spark 2026-02-23 15:30:01 +06:00
Vlad
cb2e8318e7 added multi_menu 2026-02-23 15:29:05 +06:00
Vladislav Khorev
5cca2413fe changes 2026-02-23 11:46:57 +03:00
Vladislav Khorev
db4254e205 working on web 2026-02-23 11:45:55 +03:00
fa3a4c66c9 add lead indicator 2026-02-23 14:43:23 +06:00
Vladislav Khorev
84006380db Added loading screen 2026-02-23 09:55:01 +03:00
Vladislav Khorev
f6cc30a30c Try out Cursor 2026-02-22 21:20:39 +03:00
Vladislav Khorev
d883b58260 Adapt for web 2026-02-22 20:04:18 +03:00
Vladislav Khorev
b59a10b7e6 Major refactoring for game menu 2026-02-22 19:50:13 +03:00
Vladislav Khorev
5b57696acf Refactoring major 2026-02-22 19:15:25 +03:00
Vladislav Khorev
1265d87bc5 Updated UI 2026-02-22 18:23:27 +03:00
Vladislav Khorev
46d7a2a25d Merge branch 'spark' 2026-02-22 17:02:40 +03:00
Vlad
0babfff28b added multiplayer menu 2026-02-22 19:21:12 +06:00
Vladislav Khorev
ed6e1bacc7 merge 2026-02-22 16:03:11 +03:00
Vladislav Khorev
9c39782729 Fixing bug with collisions 2026-02-22 15:53:04 +03:00
Vladislav Khorev
84d8ee7eee Merge branch 'spark' 2026-02-22 13:30:33 +03:00
Vladislav Khorev
7693237aa5 Added websocket 2026-02-22 13:29:06 +03:00
528c94e921 Add enemy target brackets + off-screen arrows 2026-02-19 01:13:08 +06:00
Vlad
a8700af1d0 added npc destroy 2026-02-13 15:40:40 +06:00
Vlad
9793c5bf06 fix npc 2026-02-12 18:13:19 +06:00
b56fafa0e0 Add mesh caching for unchanging text labels 2026-02-12 13:23:16 +06:00
Vladislav Khorev
22ee99418d Working on web version 2026-02-11 21:48:25 +03:00
4eda57b4e4 single texture atlas for all font glyphs in TextRenderer 2026-02-12 00:08:52 +06:00
Vladislav Khorev
2ffd8124f2 Change the way fire happens 2026-02-11 20:02:15 +03:00
Vladislav Khorev
210c191d41 Added different hash func 2026-02-10 21:06:21 +03:00
Vladislav Khorev
251a59ddbe added hash 2026-02-10 11:42:23 +03:00
Vlad
5df2216da6 added npc 2026-02-10 12:42:19 +06:00
Vladislav Khorev
2c1c077611 Added time offset sync, added web version multiplayer 2026-02-09 22:56:48 +03:00
Vlad
629c9ba7b1 add local server 2026-02-09 18:42:07 +06:00
Vladislav Khorev
a59bcc0c4b Adapting for web 2026-02-08 22:38:24 +03:00
Vladislav Khorev
cf1ec1e76f merge 2026-02-08 15:53:55 +03:00