Commit graph

18082 commits

Author SHA1 Message Date
Tim Felgentreff
a6024a94d0
Merge pull request #413 from AMDmi3/docs
Install docs which do not depend on doxygen regardless of doxygen availability
2022-08-31 07:23:36 +02:00
Tim Felgentreff
7e170b46e6
Merge pull request #412 from AMDmi3/isystem
Add header paths for system libraries as SYSTEM
2022-08-31 06:35:10 +02:00
Dmitry Marakasov
df008bc404 Add header paths for system libraries as SYSTEM
This ensures correct include ordering and hides warnings coming
from unrelated code. Specifically, it fixes build on FreeBSD,
which otherwise fails due to to problem in lcms code:

    In file included from .../stratagus-3.3.1/src/action/action_defend.cpp:45:
    In file included from .../stratagus/work/stratagus-3.3.1/src/include/ui.h:56:
    In file included from .../stratagus-3.3.1/src/include/viewport.h:34:
    In file included from .../stratagus-3.3.1/src/include/fow.h:39:
    In file included from .../stratagus-3.3.1/src/include/video.h:228:
    In file included from /usr/local/include/libmng.h:385:
    In file included from /usr/local/include/libmng_types.h:181:
    /usr/local/include/lcms.h:1238:29: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
    typedef int (* _cmsSAMPLER)(register WORD In[],
                                ^~~~~~~~~
2022-08-31 00:22:48 +03:00
Dmitry Marakasov
1976a2cef3 Install docs which do not depend on doxygen regardless of doxygen availability 2022-08-31 00:14:05 +03:00
Tim Felgentreff
44ddc09d76 only move units out onto their own tile by small steps 2022-08-30 22:29:02 +02:00
Tim Felgentreff
e1f99e1daf only let units position themselves freely when they were simply moving 2022-08-30 00:36:26 +02:00
Tim Felgentreff
348b05d88e Merge branch 'master' of github.com:Wargus/stratagus 2022-08-29 23:13:45 +02:00
Tim Felgentreff
4744bb49f5 implement still units positioning themselves on their own tile 2022-08-29 23:13:33 +02:00
Tim Felgentreff
2627e712e3 implement movement in formation 2022-08-29 23:13:23 +02:00
Tim Felgentreff
ef6e0431e8 fix extraction via launcher on macos 2022-08-29 23:13:12 +02:00
Tim Felgentreff
a1c0e11449
Merge pull request #411 from andreas-volz/master
Fix #410
2022-08-29 11:53:13 +02:00
Andreas Volz
2d926cf70b Merge branch 'master' of github.com:andreas-volz/stratagus 2022-08-29 11:33:52 +02:00
Andreas Volz
8042fddf46 fix the depot pointer crash 2022-08-29 11:33:32 +02:00
Tim Felgentreff
f5967815aa default to vendored libs on wargus + war1gus in vscode 2022-08-27 22:17:36 +02:00
Tim Felgentreff
9d791c0f1c
Merge pull request #407 from Wargus/tim/bundled-deps
Vendor all dependencies and allow statically linking them all
2022-08-27 21:56:55 +02:00
Tim Felgentreff
2464f98dbe vendor all dependencies and allow statically linking them all 2022-08-27 21:20:34 +02:00
Tim Felgentreff
da722465e7 make timidity cfg work with older sdl versions 2022-08-27 21:16:53 +02:00
Tim Felgentreff
52d31f6e17 make SDL timidity pick up gus patches in game or executable directory, prefer timidity over native if available 2022-08-27 21:08:06 +02:00
Tim Felgentreff
8123f12629 fix crash on debug grid drawing without minitiles 2022-08-27 21:07:03 +02:00
Tim Felgentreff
70d61a354d fix compile error 2022-08-27 21:06:57 +02:00
Tim Felgentreff
7466c8d043 fix build on macos. fixes #405 2022-08-27 11:50:49 +02:00
Tim Felgentreff
29f76cd82b add missing include. fixes #409 2022-08-27 08:12:07 +02:00
Tim Felgentreff
18df75d8da support lua callbacks for building rules 2022-08-26 23:50:04 +02:00
Tim Felgentreff
0c04d68f03 fix crash when only one mng portrait is available 2022-08-26 23:14:12 +02:00
Tim Felgentreff
e974e2ef3f make it a preference if allies can return goods to each others bases, off by default 2022-08-25 09:38:29 +02:00
Tim Felgentreff
15986db050 refactor game speed to provide a constant frame rate 2022-08-24 20:29:40 +02:00
Tim Felgentreff
699b44e46f Merge branch 'master' of https://github.com/Wargus/stratagus 2022-08-12 15:28:10 +02:00
Tim Felgentreff
3ba7987ffe Revert "allow subtile movement to end a move, reset the unbreakable flag in that case"
This reverts commit 7fbd7409db75e61264d177f1a9462009c521b9ab.
2022-08-11 20:34:23 +02:00
Tim Felgentreff
ecf08c3e40 use template specialization to ensure we don't hurt performance for map drawing when graphical/logical tile size is the same 2022-08-11 20:34:18 +02:00
Tim Felgentreff
6deef6e765 allow subtile movement to end a move, reset the unbreakable flag in that case 2022-08-11 20:34:12 +02:00
Tim Felgentreff
37511d0d8b allow logical tiles (for unit sizes and movement) to be smaller than graphical tiles 2022-08-11 20:34:04 +02:00
Tim Felgentreff
d4852b2b6e allow wiggle animation to declare it's a height displacement and honor this flag when drawing the unit shadow 2022-08-11 20:33:39 +02:00
Tim Felgentreff
e04ef948aa bump maximum map size to 1024x1024 2022-08-11 20:33:06 +02:00
Tim Felgentreff
268e622cbf start new dev cycle 2022-08-11 20:32:27 +02:00
Tim Felgentreff
1957a21d6e allow wiggle animation to declare it's a height displacement and honor this flag when drawing the unit shadow 2022-08-11 09:57:24 +02:00
Tim Felgentreff
fd99789751 bump maximum map size to 1024x1024 2022-08-11 09:13:54 +02:00
Tim Felgentreff
c57ec097b3 Release version 3.3.2 2022-08-10 20:13:08 +02:00
Tim Felgentreff
9ed69f7df1 another bit of refactoring, trying to be backwards compatible without breaking more 2022-08-09 17:53:58 +02:00
Tim Felgentreff
be4a1b45b2 refactor music callback triggers a bit 2022-08-09 08:35:08 +02:00
Tim Felgentreff
2be99339ee ensure we never enqueue more than one music finished callback 2022-08-07 21:21:14 +02:00
Tim Felgentreff
d8d1d45b36 start new dev cycle 2022-08-07 20:58:32 +02:00
Tim Felgentreff
361ee0b05c Release version 3.3.1 2022-07-31 11:44:18 +02:00
Tim Felgentreff
a2b8b76d73 fix crash when redefining player colors after map load and game start 2022-07-30 14:41:30 +02:00
Tim Felgentreff
0a475f80b3 fix music and sound callbacks sometimes not triggering correctly
this removes a prior debounce hack i did which was due to me handling the
custom sdl event to play the next file incorrectly
2022-07-30 14:21:55 +02:00
Tim Felgentreff
5e55686a0e check for targets a bit more often again when order is to move-attack 2022-07-30 13:53:17 +02:00
Tim Felgentreff
eb59c63ad0 start new release cycle 2022-07-30 13:52:59 +02:00
Tim Felgentreff
6acfad3966
Merge pull request #406 from Northfear/eager_load_fix
Fix build with disabled DYNAMIC_LOAD
2022-07-29 21:48:57 +02:00
Northfear
7d4e18b4a2 Fix build with enabled DYNAMIC_LOAD 2022-07-29 21:41:26 +03:00
Tim Felgentreff
dcca04608c fix wrong assert, compilation on ubuntu 22.04 2022-07-28 20:30:23 +02:00
Tim Felgentreff
dabf979693 Release version v3.3.0 2022-07-27 15:44:55 +02:00