1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

5042 Commits

Author SHA1 Message Date
DjWarmonger
904a66764c Optimization to getPlayerTeam functions, not very successful :/ 2015-08-30 21:42:19 +02:00
DjWarmonger
70801309bd Optimization for CGameInfoCallback:getPlayer function. It also seems to be called more often than needed. 2015-08-30 20:51:22 +02:00
DjWarmonger
cdad9f88b7 Relaxed Mutex of Logger. Attempt to optimize format function. 2015-08-30 19:26:19 +02:00
DjWarmonger
2012d53dd6 Fixed issues with exchanging combo artifacts (#2132). 2015-08-30 15:15:04 +02:00
DjWarmonger
6af8db2c69 Fixed logic discrepancy for (in)visible objects. Fixes #2224, #2225 and possibly more. 2015-08-30 09:14:54 +02:00
Ivan Savenko
aefe5923fd update sdl packages for Ubuntu/Debian to 2.0 2015-08-30 00:10:35 +03:00
Ivan Savenko
1066330925 update minimal boost version 2015-08-30 00:01:57 +03:00
DjWarmonger
a8c9727a5b Merge pull request #116 from DavidZeni/issue/2137
Okay, thank you for your contribution :)
2015-08-29 22:10:24 +02:00
David Zéni
41293caf83 Fix bad formatting 2015-08-29 20:02:27 +02:00
David Zéni
b49fb7d07f Refactor actions for Catapult
No target -> Pass
No player or no ballistics -> automatic action
Else -> manual action
2015-08-27 23:03:48 +02:00
David Zéni
bd52a0d3e4 Merge branch 'develop' into issue/2137 2015-08-26 21:08:20 +02:00
David Zéni
f84e5cf8b3 When hero has ballistics and no target pass turn 2015-08-26 20:54:24 +02:00
DjWarmonger
ee08e6be79 Merge pull request #115 from bwrsandman/creature-garisson-tooltip
Looks good to me, merging.
2015-08-26 15:51:07 +02:00
Sandy Carter
a79ade7d44 Garrison: Move all but one creature when last slot 2015-08-26 08:44:23 -04:00
Sandy Carter
dafc40d896 Garrison: Fix selection behaviour when swapping with ally 2015-08-26 08:40:00 -04:00
Sandy Carter
a89ef88ce3 Garrison: Factor complex if statement to functions 2015-08-26 08:40:00 -04:00
Sandy Carter
cd13807115 Garrison: Clarify upg by turning into a class enum 2015-08-26 08:39:57 -04:00
Sandy Carter
b008d24c68 Garrison: Refactor Left Click
Restructure large nested if statements into more shallow blocks
Factor out contents of if statements to functions for better readability
    * viewInfo
    * hightlightOrDropArtifact
    * split
2015-08-25 09:47:23 -04:00
Sandy Carter
3d327e650a Garrison: Boyscouting: simplify clickLeft 2015-08-25 09:47:23 -04:00
Sandy Carter
c02700853a Garrison: Disable split buttons when visiting ally 2015-08-25 09:47:23 -04:00
Sandy Carter
742f244426 Garisson: Documentation: Convert comments to doc 2015-08-25 09:47:23 -04:00
Sandy Carter
6ffb03cba3 Garrison: Documentation for our() and ally() 2015-08-25 09:47:21 -04:00
Sandy Carter
219ce45866 CastleInterface: Fix tooltip saying Empty after swapping armies 2015-08-25 09:22:25 -04:00
Sandy Carter
b2da2b8ef0 Garrison: Show "(in garisson)" for garissoned heroes' creatures 2015-08-25 09:22:25 -04:00
AlexVinS
68e3948242 Fix mantiss 1965 2015-08-25 12:16:47 +03:00
Sandy Carter
ae6d3c9138 CCastleInterface: Enable right click on Hero Info 2015-08-24 13:31:03 -04:00
Alexander Shishkin
d1ebf24b55 Merge pull request #113 from bwrsandman/arch
Add Arch dependency section to Readme
2015-08-24 09:07:21 +03:00
Alexander Shishkin
07d8bf9c0c Merge pull request #112 from bwrsandman/doxygen
Add UseDoxygen to cmake
2015-08-24 09:03:56 +03:00
Sandy Carter
9fe84355e8 Add Arch dependency section 2015-08-23 22:30:04 -04:00
Sandy Carter
651f225ae0 Add doc build instructions in linux readme 2015-08-23 22:23:20 -04:00
Sandy Carter
1b3c3ee9ca Add UseDoxygen to cmake
Allow use of cmake . && make doc
Requires UseDoxygen.cmake from http://tobias.rautenkranz.ch/cmake/doxygen/
2015-08-22 12:49:27 -04:00
Sandy Carter
236492ed39 widgets: Cleanup musicButton specific hacks 2015-08-22 12:40:14 -04:00
Sandy Carter
bf353a4f5b windows: Replace CToggleGroup volume widget with CVolumeSlider 2015-08-22 12:40:14 -04:00
Sandy Carter
6a3c2d3071 gui: Fix in parameter for scroll events
Refetch mouse position before checking if mouse is in widget Rect
Give acurate position of the mouse when scrolling
2015-08-22 12:40:14 -04:00
Sandy Carter
9d62a2f0a1 Buttons: Add CVolumeSlider widget
New widget specifically for volume settings.
Replace previous implementation using 10 toggle buttons.
Enable indicator animation
Fix indicator ghosting when drag and releasing
Add scroll capability to volume
Volume now can be adjusted from 0 - 99 with the mouse or the scroll wheel
2015-08-22 12:40:14 -04:00
Sandy Carter
c6b51a7beb Boyscouting: Fix doxygen format
Remove commas to separate param from description
Use three slashes-style
2015-08-22 12:40:14 -04:00
Sandy Carter
f28c33001c Boyscouting: Fix typo in comment 2015-08-22 12:40:14 -04:00
Sandy Carter
a14711b3b4 Boyscouting: Fix backwards ternary operator 2015-08-22 12:40:14 -04:00
Sandy Carter
aa70df65f9 gitignore: Add common editor backups 2015-08-22 12:40:14 -04:00
AlexVinS
371e4b8714 Fix mantiss 2235, 2237 2015-08-22 16:47:40 +03:00
AlexVinS
40d3bb40c3 Partial fix for mantiss #2237 2015-08-22 16:22:10 +03:00
AlexVinS
782c8ec40b Changed windows minimum version back to winxp due to mingw bug
* will be changed back after newer mingw tests
2015-08-20 04:22:54 +03:00
AlexVinS
5dfd48a4fa Addition to win 64 build 2015-08-20 03:28:04 +03:00
AlexVinS
03a295f1a0 Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts 2015-08-20 03:28:04 +03:00
AlexVinS
f24f744f4b Fix a few warnings 2015-08-19 23:02:37 +03:00
Sandy Carter
bdee647525 CastleInterface: Exclude previous building upgrade in reqs
Hide CityHall from Capitol prerequisites in Capitol build window
2015-08-19 12:05:43 -04:00
DjWarmonger
237d3f2624 Refactoring: random spells 2015-08-12 16:40:08 +02:00
DjWarmonger
3863756009 Version bump. 2015-08-01 18:37:14 +02:00
DjWarmonger
2dfcead9ef - Updated MSVS project
- Updated changelog to 0.98c
2015-08-01 17:49:12 +02:00
AlexVinS
83fdce473e Fix mod schema: RMG templates added. 2015-07-27 08:36:19 +03:00