games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
15,653 Commits 19 Branches 62 Tags 112 MiB
21bb61fc4d
Commit Graph

141 Commits

Author SHA1 Message Date
Ivan Savenko
9188280d02 Fix access to CPrologEpilogVideo after destruction from sound callback 2024-04-11 13:25:54 +03:00
Ivan Savenko
c3957c2c2a Moved json files to new directory, split on per-class basis 2024-02-14 13:08:24 +02:00
Ivan Savenko
4c70abbeb5 Reduced usage of global variables - removed or made const / constexpr 2024-02-12 13:49:45 +02:00
Ivan Savenko
46fe6c1b09 Fixed crash on missing campaign audio files 2024-02-01 18:08:01 +02:00
Laserlicht
d53dd83466
fix; cleanup; optimized times 2024-01-26 21:58:39 +01:00
Laserlicht
3d57437e52
move logic to tick 2024-01-26 20:13:02 +01:00
Laserlicht
c426382687
Apply suggestions from code review 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
 2024-01-26 20:09:17 +01:00
Laserlicht
3b9372c51c
Code review 2024-01-25 20:49:59 +01:00
Laserlicht
e3acb92863
codestyle 2024-01-24 20:32:39 +01:00
Laserlicht
8870547d02
simplyfied 2024-01-24 01:23:35 +01:00
Laserlicht
e59078320c
format fix 2024-01-24 01:22:34 +01:00
Laserlicht
134eaa1583
sync subtitle 2024-01-24 01:17:23 +01:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix) 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
 2023-10-19 16:23:21 +02:00
Laserlicht
89a39fcfc0
code review 2023-10-08 20:27:56 +02:00
Laserlicht
be2b3afe48 implements sounds 2023-10-08 12:49:59 +02:00
Laserlicht
8de4b88a1b basically playing 2023-10-08 12:49:59 +02:00
Laserlicht
63fbaa8380 support raw audio 2023-10-08 12:49:59 +02:00
Ivan Savenko
9cfcf5ea19 Fix regressions 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Michael
cde22b3755
fix 2023-08-26 21:37:29 +02:00
Michael
bd0f9bb280
preparation 2023-08-26 19:53:36 +02:00
Ivan Savenko
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
Ivan Savenko
dfe8ca3d61 Use more lightweight scoped_lock 2023-08-23 16:32:29 +03:00
Ivan Savenko
ed066cb7ba Fixed possible multithreading races in sound/music callbacks 2023-08-08 00:27:03 +03:00
Ivan Savenko
9eac3eaafa Merged "music" resource type into "sound", enables ogg's use as sounds 2023-05-15 22:22:54 +03:00
Ivan Savenko
71ddaeea6e Fix crash on missing music file 2023-04-08 19:47:16 +03:00
Ivan Savenko
9062d67f80 Fixed volume of ambient sounds 2023-03-28 18:56:44 +03:00
Konstantin
7a04c28815 vcmi: remove pickupSounds set 
It is unused now, resource pickups handled similar like necromancy
 2023-03-11 21:41:57 +03:00
Ivan Savenko
5f396af14c Remove excessive logging 2023-03-07 00:06:58 +02:00
Ivan Savenko
b61cae5b37 Fixed minor issues discovered during testing 2023-03-05 18:02:59 +02:00
Ivan Savenko
b57a07b10f Restored ambient sounds functionality 2023-03-05 18:02:59 +02:00
Ivan Savenko
108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
Ivan Savenko
fc0f5a9fb3 Reduced SDL includes 2023-01-20 16:11:43 +02:00
Ivan Savenko
21c053ba87 Fix assertion failure on shutdown 2023-01-20 15:15:57 +02:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Ivan Savenko
4f3ea0d1d9 Renamed Terrain.h/cpp -> TerrainHandler.h/cpp 2023-01-10 00:01:35 +02:00
Ivan Savenko
f51b3bca57 use JsonKey or NameTranslated instead of ambiguos Name 2023-01-10 00:01:35 +02:00
Ivan Savenko
7c7ae26e67 Map/Road/River identifiers are now private members 2023-01-10 00:01:35 +02:00
Ivan Savenko
64885bdf6b Better names for terrain parameters. Support for new movement sounds. 2023-01-10 00:01:35 +02:00
Ivan Savenko
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00
Ivan Savenko
1468f6aded Converted terrainTypeHandler into proper handler class 2023-01-10 00:01:35 +02:00
Ivan Savenko
8526eba6fa Added checks to music player to detect potential freezes 2023-01-09 13:05:15 +02:00
Ivan Savenko
b275d9de72 merge beta branch into develop 2022-12-29 22:08:53 +02:00
Ivan Savenko
61ed408f61 Fix typo 2022-12-29 21:49:20 +02:00
Ivan Savenko
588b635d1c Workaround for a potential deadlock in MusicHandler 2022-12-29 21:49:20 +02:00
Ivan Savenko
facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
Ivan Savenko
e6afd8621c Minor improvements & fixes to music player 
- music will be selected correctly after rapid leaving and reentering
town screen
- music sets are now store as single std::map instead of unnecessary
"map of maps"
- fixed computation of resume time for restarted/looped music tracks
- updated & clarified some comments
- converted C functions for SDL_Mixer callbacks into lambdas
- formatting fixes
 2022-11-21 16:20:20 +02:00