games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
13,547 Commits 19 Branches 61 Tags 108 MiB
70acf987b4
Commit Graph

114 Commits

Author SHA1 Message Date
Fay
b03eb56706 Possibly fixes looping videos; 2015-01-25 14:28:11 +01:00
Ivan Savenko
b551bdb725 Final part of the merge 
Merging VCMI Dirs refactoring + GUI refactoring with current develop
 2014-09-04 20:59:07 +03:00
Karol
1b6f2ea3b7 VCMIDirs update #5 fix 
- Updated old OS detect macros.
- Fixed 1 misspell.
 2014-08-26 12:19:04 +02:00
AlexVinS
679dd64ff9 Make scale a parameter of "open" methods 2014-07-10 14:18:21 +04:00
Michael Pavlyshko
11d73f2ac9 fix CVideoHandler compilation 2014-07-09 18:01:12 +03:00
AlexVinS
18f34e14f8 set scale to off by default 2014-07-08 22:01:01 +04:00
AlexVinS
0efb6e2890 Use scaling 
(*) into - fullscreen
(*) spellbook - no scaling
 2014-07-08 18:20:22 +04:00
AlexVinS
61b31e5c60 add api to enable|disable scaling (unimplemented) 2014-07-08 17:39:47 +04:00
AlexVinS
c71237bba3 Mingw build with ffmpeg 
(*) get rid of BIK SMK dlls
(-) missing sound
(-) spellbook is scaled to fullscreen
 2014-07-08 16:40:25 +04:00
Ivan Savenko
6205d07223 Re-enabled video player, should now work with SDL 2 2014-06-13 07:55:46 +04:00
Ivan Savenko
8eb661461c - vcmi compiles with SDL2 on Linux, video player is disabled for now 2014-06-13 07:55:45 +04:00
AlexVinS
8a3b997fa5 fix a few comments. No code changes. 2014-05-21 13:02:20 +04:00
Michał W. Urbańczyk
0b2ca4416a It is possible to use ffmpeg with Visual Studio 2013 build by definining USE_FFMPEG macro. 2014-01-06 19:12:21 +00:00
DjWarmonger
d8594576e2 One more compile fix, works now fine on Windows. 2013-07-29 12:15:50 +00:00
Ivan Savenko
77496bcea9 - fixed several cases of accessing full path to files in archives 2013-07-29 11:38:18 +00:00
DjWarmonger
a314a81fd5 Compile fixes. Game doesn't even launch, however. 2013-07-28 18:57:07 +00:00
Ivan Savenko
b87897096c Filesystem handling is now more flexible 
- removed CResourceLoader class in favor of one that implements resource loader interface
- removed global pool of files, in favour of more dynamic approach
- renamed some files to match current situation
All these changes are needed mostly for future mod manager + .zip support
 2013-07-28 14:49:50 +00:00
Ivan Savenko
2b45e13c5c c++03 -> c++11 switch: 
- use std versions of function, bind and ref
- OVERRIDE -> override
- NULL -> nullptr
- use std versions of random distributions

NOTE: this may be last revision that supports gcc-4.5
 2013-06-26 11:18:27 +00:00
beegee1
c7c2686379 - Integrated the logging API into the client and the lib - Remove some more comments and switched to /// style - Fixed recursive locks - Added Global.h to CMakeLists(now visible in qt-creator) - Removed usage of shared_mutex - Added unique_ptr to CLogger targets 2013-04-09 14:31:36 +00:00
beegee1
30bcec42c6 - Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui 2013-04-07 11:52:07 +00:00
beegee1
ee51c5beb5 - Renamed /lib subfolders to lowercase 2013-04-07 10:48:07 +00:00
Ivan Savenko
9c1c337a3d - fixed #1220 and #1218 
- vcmibuilder will correctly install campaign video
 2013-02-27 15:46:14 +00:00
Ivan Savenko
3f309f0c5e - removed support for ancient versions of ffmpeg 
- some cleanup in Linux video player
 2013-02-05 23:11:48 +00:00
Michał W. Urbańczyk
17755caa10 * fixed #1199 
* fixed advancing between misisons in campaigns
 2013-02-05 20:06:13 +00:00
Ivan Savenko
85a23e298c - generic string ID -> numeric ID resolution system 
- - hero army and creature upgrade names are resolved using new system
- - faction names and creatures in towns are resolved using new system
- (linux) replaced build_data.sh with hopefully better vcmibuilder script
- minor fixes
 2012-12-03 16:00:17 +00:00
Ivan Savenko
2643762f08 Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +00:00
alexvins
369f0ae9c6 [PLATFORM] MinGW support added 
* disabled features unsupported by MinGW
* fixed issues with DLL_LINKAGE
! BOOST_THREAD_VERSION in now 3 workaround for existing code added, consider refactoring.
* some small tweaks ("-fpedantic" warnings)
 2012-09-15 19:16:16 +00:00
Ivan Savenko
e79ac5f1d7 - removed deprecated ffmpeg functions. Fixes #779 
- removed hardcoded video name constants
 2012-08-21 17:37:06 +00:00
Ivan Savenko
deb22b3674 - (linux) use empty video player if av_register_protocol function was not found 2012-08-18 10:29:54 +00:00
Ivan Savenko
eec4d3579d - fixed crash on missing videos 
- fixed savegames name selection
 2012-08-11 11:34:49 +00:00
Ivan Savenko
d72c44e4c3 - fixed modifiers keys behaviour in TextInput 
- erm compilation is optional in cmake (too memory-consuming for old systems)
-  minor fixes
 2012-08-10 08:49:18 +00:00
Ivan Savenko
7e778045b8 - removed no longer used CSndHandler. Transition to new fs is finished 
- moved TownHandler::requirements to CBuilding class
 2012-08-09 10:32:50 +00:00
Michał W. Urbańczyk
08bcfd1285 * windows video player uses the new FS 
* don't crash on missing sounds
 2012-08-09 07:40:47 +00:00
Ivan Savenko
94cfc99d7b - fixes #1044 
- fixes to linux video player
 2012-08-08 20:58:06 +00:00
Ivan Savenko
127600311f - linux video player uses new FS 2012-08-08 12:17:25 +00:00
Ivan Savenko
235cf458d7 - fixed text duplication in choice windows 
- fixed compile issues
- added unused and untested for now CComponentBox
 2012-07-02 21:51:48 +00:00
Ivan Savenko
49495c9caf - possibly fixed #966 and #958 
- fixed crash on shutdown 
- fixed compile issue #973
 2012-05-25 11:49:56 +00:00
Ivan Savenko
9efe05c90b - removed usage of Graphics in several places (Components and hero window). 
minor:
- fixed several deprecation warnings in video player
- config file may have multiple upgrades for creatures
 2012-05-13 15:04:21 +00:00
Ivan Savenko
86e7d96b39 - setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json) 
- some work on system settings window
- new menu for selecting resolution (reused town portal graphics), can be opened from system settings
 2012-01-12 15:23:00 +00:00
Ivan Savenko
91c0ce33f4 - re-generated build system 
- fixed several gcc issues
 2011-12-31 10:03:29 +00:00
beegee1
156aa6e4d9 * Updated class - file - handling 
* Renamed color constants
* Renamed class AdventureMapButton to CAdventureMapButton
* Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses
* Moved new creature window from GuiClasses to CCreatureWindow
 2011-12-22 13:05:19 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface 
Introduction of pre compiled headers,...
 2011-12-13 21:23:17 +00:00
Michał W. Urbańczyk
750995f7f9 A patch from Gesh fixing and #819 and removing reduntant #ifdefs (DLLHandler is win-only anyway). 2011-09-22 14:21:53 +00:00
DjWarmonger
4895540f80 Compile fixes. 2011-08-08 14:37:18 +00:00
Ivan Savenko
c63df4f07a - compile fixes for linux player 2011-08-08 14:20:22 +00:00
Michał W. Urbańczyk
05f166f751 Portability fix for „Win64”. 32-bit DLLs (bink, smack) cannot be loaded, so an empty player-placeholder is used to capture calls we can't properly handle. 
Probably some fixes for Linux will be needed. (I guess the whole thing could use some refactoring to unify more code)
 2011-08-08 07:12:18 +00:00
DjWarmonger
de0d6b8c17 Compile fix. 2011-08-07 19:30:30 +00:00
Frank Zago
2cc80e1267 Modified CMediaHandler to handle more than one file. 2011-08-07 19:14:46 +00:00
Frank Zago
18a376696d Support for newwer libavformat API. Patch from exine, bug #779. 2011-08-04 22:12:53 +00:00
Ivan Savenko
75d068bc03 - compilation fix for #765 2011-07-05 19:06:47 +00:00
Ivan Savenko
39feb24d64 - possibly fixed #763 2011-07-03 10:04:06 +00:00
Frank Zago
98577e402f av_free_packet is a library call. Don't reproduce its code here. 2011-05-04 03:42:09 +00:00
Ivan Savenko
e494171de3 - several changes to get reusable code 
- possibly fixed #725
- bug in random seed initializing?
 2011-04-30 18:16:58 +00:00
beegee1
45fba15511 * Reverted previously changed PreGame code 
* Added the missing AB video resource file in linux code, AB campaign selection videos should now play BUT they don't => it seems that ffmpeg can't handle older BINK videos
* Fixed a visual glitch which could be seen at the WOG animation in the main menu on a linux machine
* Fixed the random crashes bug on mouse centering at startup on linux
* Fixed a visual bug at the bonus selection screen when starting a campaign-map
* Changed some positions in the bonus selection screen, no bonus pre selection, you cannot start the campaign when no bonus is selected (like in h3)
* Added a border functionality to the AdventureMapButton
* InfoWindow buttons and some other buttons have now the border which heroes 3 buttons have
* Fixed a app crash when you start a campaign two times in one session
 2011-04-26 13:30:29 +00:00
beegee1
66b708c168 * PreGame interface gets now redrawn every frame. 
* Changed PreGame event handling and update/draw order.
* Changed mouse cursor drawing in PreGame
* Fixed linux bug where main menu WOG animation gets played only once, windows/linux video handling is now more similar
* Minor code improvements
 2011-04-17 18:02:13 +00:00
Frank Zago
b0cecac5c9 (linux) Use avcodec_decode_video when avcodec_decode_video2 is not present. Updated vcmi version number. 2011-04-08 04:21:41 +00:00
Ivan Savenko
0f605256e9 - added new files to build system 
- minor gcc fixes
- updated castle interface code, added missing parts including #380
- buildings enum in global.h
 2011-04-07 17:54:08 +00:00
Frank Zago
69364b5b60 Various gcc compile fixes, and updates to linux code. 2011-04-07 02:16:32 +00:00
Ivan Savenko
7209f158a1 - gcc/Linux fixes 
- added --nointro parameter to skip intro videos
- minor fixes to scenario selection menu
 2011-03-19 22:27:05 +00:00
beegee1
fb929fa9b0 AB campaign selection screen added 2011-03-19 14:27:51 +00:00
mateuszb
b4edd10e6c * beegee's comments patch 
* very minor changes
 2011-02-22 11:52:36 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done 
* hch contents distributed to more appropriate folders
 2010-12-20 21:22:53 +00:00