Commit graph

210 commits

Author SHA1 Message Date
Tim Felgentreff
fee744aa1b re-add libretro shader support, add default shaders and lua API 2020-06-05 09:36:03 +02:00
Tim Felgentreff
d67a0319da remove software scaling again 2020-06-02 14:19:27 +02:00
Tim Felgentreff
b81eefae26 Merge remote-tracking branch 'origin/galtgendo/sdl2' into galtgendo/sdl2 2020-05-31 10:55:55 +02:00
Tim Felgentreff
dc67f91560 export clangd configuration 2020-05-31 10:52:21 +02:00
Tim Felgentreff
8382f38aef wip: compilation on windows 2020-05-02 07:24:10 +02:00
Tim Felgentreff
059225bb83 Merge remote-tracking branch 'origin/master' into galtgendo/sdl2 2020-04-25 14:21:57 +02:00
Tim Felgentreff
6b30981702 Release version 2.4.3 2020-04-25 10:05:52 +02:00
Tim Felgentreff
e37901b33d add xbrz 2020-04-23 13:33:38 +02:00
Tim Felgentreff
60da592a36 profiling build 2020-04-20 17:06:29 +02:00
Tim Felgentreff
b25b4eccb6 use hqx based on original 2020-04-20 17:06:11 +02:00
Tim Felgentreff
a671773dd2 use openmp to parallelize AdvMAME scalers 2020-04-20 16:37:26 +02:00
Tim Felgentreff
908670c2e1 add scale3x, hq2x, hq3x 2020-04-20 08:38:29 +02:00
Tim Felgentreff
4015a88c50 kill dead code 2020-04-17 10:00:48 +02:00
Tim Felgentreff
11589fe432 re-add lost mng cpp 2020-04-17 09:59:00 +02:00
Tim Felgentreff
f3eb06e12a use SDL2_image instead of libpng 2020-04-16 15:08:18 +02:00
Tim Felgentreff
dd9d287945 delete all OpenGL, GLES, Fluidsynth, mikmod, touchscreen, and mng code. these are all handled by SDL/SDL_mixer 2020-04-16 07:59:01 +02:00
Tim Felgentreff
6b73fd7b97 use SDL_mixer to handle all our sound needs, and delete all the custom code 2020-04-16 07:59:01 +02:00
Tim Felgentreff
af307f9f17 Merge remote-tracking branch 'origin/master' into galtgendo/sdl2 2020-04-16 07:57:37 +02:00
Talas
accaaf56e1 add a simple explore action
flies around randomly, much room for improvement
2019-07-07 15:38:29 +02:00
Tim Felgentreff
837db28692 support compilation on Haiku 2018-11-02 19:40:59 +00:00
ChefKeeper
720419de2f CMake correction 2018-09-27 20:55:30 +00:00
ChefKeeper
43d7fee538 Windows 7 crash, added an option to CMake :
If stdio redirection is enabled compile with WIN32 (windows app with no console)
else when no redirection we need a console app to write all the stdio
2018-09-27 20:55:29 +00:00
Tim Felgentreff
77326cc78f enable stdio redirect by default on Win32. Partial fix for Wargus/wargus#255 2018-09-27 20:55:28 +00:00
Tim Felgentreff
b5fc775ddb Add uninstall target. Fixes #215 2018-09-27 20:55:27 +00:00
Tim Felgentreff
af300c440b Revert "Declare dpi awareness so we don't get streched by windows". Should fix #204 and fix #203
This reverts commit 9b39ebd4b3.
2018-02-04 15:14:34 +01:00
Tim Felgentreff
493bd57ddb prepare release 2.4.2 2017-06-11 12:16:18 +02:00
Tim Felgentreff
c28db9ae59 split game launcher header, so extraction tools can use the smaller header for showing errors 2016-12-01 18:01:13 +01:00
Tim Felgentreff
57d63e9cd5 rename, concat, and ship our adapted tinyfiledialogs header 2016-11-19 15:17:58 +01:00
Tim Felgentreff
8ffc992f58 install metaserver on debian 2016-11-14 13:43:46 +01:00
Tim Felgentreff
6922ff42d8 error on the default warnings 2016-11-08 23:50:55 +01:00
Tim Felgentreff
5e8746862a Compile with c++ 0x support 2016-11-07 16:37:14 +01:00
Tim Felgentreff
e9a07ff2ff Implement a simple 32-bit checksum for lua files, and use that to ensure we're running the same game. Network version check was useless, because we're already comparing the full engine version, and the two were derived from the same numbers. Fixes #193 2016-11-07 16:26:24 +01:00
Tim Felgentreff
9b39ebd4b3 Declare dpi awareness so we don't get streched by windows 2016-11-07 10:00:18 +01:00
Tim Felgentreff
b81ed71ec1 Ship our own SDL.dll 2016-03-07 12:08:54 +01:00
Tim Felgentreff
728edd2ba2 ship lua51.dll with stratagus 2016-03-07 11:15:25 +01:00
Tim Felgentreff
54b89e3049 search and include libjpeg only for msvc 2016-03-06 18:29:07 +01:00
Tim Felgentreff
59ac576e25 port sdl2 x4 patch 2015-12-20 18:33:21 +01:00
Tim Felgentreff
6b970f12d0 port to sdl2 x2 patch by galtgendo 2015-12-14 10:38:37 +01:00
Tim Felgentreff
aa82e54b5f update documentation after move to Github 2015-12-08 10:55:16 +01:00
Andrettin
b5d66547f7 Added autosave support, updated changelog, updated version to 2.4.0 2015-12-04 18:13:53 +01:00
KroArtem
358af4e537 start removing maemo support 2015-12-03 15:03:35 +03:00
Tim Felgentreff
889cecc674 bump version and update urls for debian package 2015-12-02 12:52:12 +01:00
Tim Felgentreff
3ab44693d8 build nsis installer on appveyor and release to github 2015-12-01 17:43:36 +01:00
Tim Felgentreff
9e43d695d2 updates to make compilation with vs 2015 work 2015-12-01 17:43:27 +01:00
Tim Felgentreff
e47cf541c1 fix compilation on mac os x 2015-11-24 17:30:27 +01:00
Tim Felgentreff
cee9e396c8 enable appveyor builds 2015-11-23 18:52:02 +01:00
Tim Felgentreff
62d310f29a only add VS2013 flags if we need them 2015-10-16 12:33:41 +02:00
Tim Felgentreff
3a29810853 add shaders for fullscreen pixel scaling algorithms 2015-10-16 12:28:08 +02:00
Pali Rohár
0c4ef0c400 Fix compiling metaserver on WIN32 2015-04-12 11:55:12 +02:00
Pali Rohár
04e6ebcc12 Add new version of WINAPI code for attaching console 2015-04-12 11:54:50 +02:00
cybermind
c0807df223 [-] Fixed NSIS scripts 2015-03-19 17:43:24 +05:00
cybermind
1656d2c66b [-] Removed SideAttack if-case 2015-03-18 18:53:04 +05:00
cybermind
46f7162c2f [+] Introduced crash dump writing for win32
[-] Fixed crash if engine is tried to play unloaded sound
2015-03-15 22:56:45 +05:00
cybermind
cfbfca0cd4 [+] Added support for StackTrace library to log call stack into stderr in case of crash 2015-02-19 18:47:55 +05:00
cybermind
f3718a24d3 [+] Addec option for parallel build on MSVC
[-] Removed MinSizeRelease, RelWithDebInfo configurations
2015-02-13 22:39:28 +05:00
cybermind
c560b02922 [+] Added Fluidsynth support for MIDI playback
[*] Increased sound channel count to reduce sound lags
[*] SetDefaultTextColors is available from Lua
2014-10-20 23:58:56 +06:00
cybermind
01cb1aed06 [+] Merged branch lp:~timfelgentreff/stratagus/stratagus 2014-06-02 22:14:45 +06:00
cybermind
d4ecd6327d [+] Enhanced spell casting:
-ability to define user conditions for spell using Lua scripts. Just use "callback" keyword in conditions, followed by function name after comma. If function returns true, the condition pass and vice versa.
-ability to define user actions for spell using Lua scripts. Use "lua-callback" action type, followed by function name after comma.
2014-02-25 22:30:32 +06:00
cybermind
bc16a6c6eb [+] Metaserver client code rewritten: now using class CMetaClient available through Lua 2013-12-05 21:03:34 +06:00
Tim Felgentreff
7340710df0 fixes to CMakeLists to compile on OS X 2013-10-02 16:28:16 +02:00
cybermind
210369b752 [+] Added new MissileStraightFly, which flies straightly, until it reaches terrain tile field flags mask specified in MissileType::MissileStopFlags. You can use KillFirstUnit property, so missile will explode on first unit.
[*] More correct missile handling in MissileHandleBlocking
[*] Missile with KillFirstUnit can't kill dead or non-solid units
2013-09-01 11:44:48 +06:00
cybermind
06d0641ddd [+] Implemented old behavour for storing user data (logs, saves etc) to path where Stratagus is installed. To use this feature, enable ENABLE_USEGAMEDIR option in CMake 2013-08-03 18:43:17 +06:00
cybermind
2fa0216c2f [+] Added CAnimation_LuaCallback which allows user to call lua functions from animations.
Usage: "lua-callback func_name arg1 [argN ...]"
2013-05-09 22:32:37 +06:00
joris
afe6b7e8cc Move CMapField code into its own file. (and so remove map_save file) 2013-04-21 15:35:48 +02:00
cybermind
a4b526c42c [+] Added teleport spell 2013-04-15 20:39:16 +06:00
joris
af53391cee Add classes CHost and CUDPSocket. 2013-04-04 23:59:29 +02:00
joris
3c8cbe8e84 Add a simple main.cpp to ease the use of unitTest. 2013-04-03 18:24:22 +02:00
joris
8c58c7b05e Move network messages into its own file. 2013-03-24 14:57:58 +01:00
cybermind
11e825b9e3 [+] Added an ability to define custon user in-game UI buttons
[-] Fixed popup drawing while pie menu is active
2013-02-25 18:53:02 +06:00
Pali Rohár
781af593cb Fix cmake dependences for version-generated.h
* Seems like different versions of CMake and GNU Make doing different things and does not resolve dependeces correctly
* add_custom_command in old version of CMake cannot depends on non-file target
* Old version of CMake does not resolve dependency stratagus.cpp --> version.h --> version-generated.h and trying to compile stratagus.cpp before version-generated.h
* And when generating doxygen documentation, it cannot find rule how to generate version-generated.h, so in stratagus_HDRS file version-generated.h must be twice

* I belive that now compilation is working with CMake 2.6, 2.8, GNU Make 3.8 and Ninja
2013-02-08 23:06:10 +01:00
Pali Rohár
65c8c26b68 Add support for Native SDL GLES mode and GLES via EGL 2013-02-08 19:55:03 +01:00
Pali Rohár
9beb9f25b2 Make OpenGL support optional 2013-02-08 18:53:21 +01:00
Joris
3c0a1ee386 Move parameters class in its own file.
Move some code from stratagus.cpp to utils.cpp
2013-02-08 17:20:58 +01:00
Pali Rohár
0dd75032fc Generate file version-generated.h when cross compiling too (but there is no support for bzr rev) 2013-02-08 14:37:06 +01:00
Pali Rohár
24f4f31b1c Fix cmake flags for gcc 2013-02-07 14:59:50 +01:00
cybermind
6e8a218720 [+] Added ability to take resources for spell cast
[-] Fixed version compilation for MSVC
2013-02-07 19:22:06 +06:00
Pali Rohár
c1df18ef4d Fix generating file version-generated.h 2013-02-05 23:39:30 +01:00
Pali Rohár
2fc762b2d9 In Windows NSIS Installer use version from cmake 2013-02-05 22:27:43 +01:00
Pali Rohár
2f667d0c85 Add VERBATIM to all cmake add_custom_command calls, which causing that arguments will be escaped properly 2013-02-05 22:19:20 +01:00
Pali Rohár
a0ff593ed8 Generate version string at compile time from CMakeLists.txt and from bzr revision
* Move StratagusMajorVersion, StratagusMinorVersion, StratagusPatchLevel and StratagusPatchLevel2 to CMakeLists.txt
* Added tool genversion.cpp which (re)generate file version-generated.h from cmake if needed
* Fill VERSION macro from other values with C preprocessor instead hardcoded values
* Remove macros StratagusFormatString and StratagusFormatArgs from code, use only VERSION
2013-02-05 22:16:43 +01:00
Pali Rohár
7c2f6c81a9 Remove HAVE_X and HAVE_X11 definitions, add USE_X11
* This commit enabling clipboard (copy/paste) support on systems with X server

* Now we are using USE_* defines for stratagus features and HAVE_* defines for system native functions (not reimplemented in stratagus)
* So all stratagus builds with different HAVE_* defines should work same and should have same features
2013-02-05 17:14:46 +01:00
Pali Rohár
e7146ac413 Fix ENABLE_STRIP in CMakeLists.txt, now working only with gcc 2013-02-05 17:00:02 +01:00
Pali Rohár
db0fc4d49c Add -DDEBUG via add_definitions 2013-02-05 16:56:16 +01:00
Pali Rohár
d291e598a3 Remove __unix, unix and __APPLE__ defines, add new USE_LINUX and use USE_LINUX and USE_APPLE in current code 2013-02-05 16:48:08 +01:00
Pali Rohár
cfc336586b Use cmake for determinate if system has getopt function, use util.h for getopt 2013-02-05 15:54:34 +01:00
Pali Rohár
606d5ef476 Functions strcpy_s, strncpy_s and strcat_s must return errno_t
* Use cmake for determinating if system has above functions
* Compile our implementations only if system does not have these functions
* Define macro _TRUNCATE if is not defined
* Define errno_t if is not in any standard header include file
* Define prototypes of above functions only if system does not have them

* This commit fix compilation with ubuntu mingw-w64 cross compiler
2013-02-05 15:28:21 +01:00
joris
76cb9306a7 Move Popup releted stuff from ui.cpp into (new) popup.cpp 2012-12-31 15:24:08 +01:00
joris
c0f82a019a Move CUITimer and CStatusLine in there own files. 2012-12-31 14:08:18 +01:00
joris
c01bef9426 Use PixelPos in ContentType.
Fix some error message.
Commit missing CMakeLists.txt modifications for the new files from last commit
2012-12-31 12:02:34 +01:00
Pali Rohár
3aa2e8230e PkgConfig package is needed only on Linux for determinate Maemo platform 2012-12-28 09:40:09 +01:00
cybermind
09e63586c7 [+] Added new order COrder_Defend, which allows to send some unit to defend another. You may use right click with ALT, or use the "move" button with ALT button
[*] The coward units in AI force now use Defend order instead of attacking. The same rule applies to summoned units.
[*] The summoned units get GroupId = -1 to avoid AI defence force activate
[*] Changed CclKillUnitAt to use CclGetPos
2012-12-27 14:58:44 +06:00
cybermind
57ecef96a2 [+] AI improvement: it can now gather all units close to enemy, after that it attacks
[-] Fixed missing file in previous commit
[-] Fixed bug when player cancels a building.
[-] Fixed bug with speedup variables in CclGetPlayerData and CclSetPlayerData
2012-08-31 22:55:27 +06:00
Pali Rohár
e89e3ed2e7 Release version 2.2.7 2012-08-20 15:27:46 +02:00
joris
16f09eecc7 Move CColor in its own file.
Remove SDL dependency for font.h
Remove duplicated container AllFonts
Remove unused Macro MaxFonts
2012-08-14 17:35:58 +02:00
joris
dec4c95232 rename network/lowlevel.cpp into network/net_lowlevel.cpp (according to .h) 2012-08-13 14:51:43 +02:00
joris
62f36a96b3 Create game.h and move some stuff from stratagus.h into more appropriate header. 2012-08-11 14:19:13 +02:00
joris
5f54853efe Add specific spell header 2012-08-10 15:40:52 +02:00
joris
abfe3f2086 Split spell by SpellActionType. 2012-08-10 13:26:54 +02:00
joris
d6da2d2c21 Move spell stuff in its own directory. 2012-08-10 12:23:53 +02:00
cybermind
dde984d690 [+] Added new RadialParticle
[+] Make particles more configurable from Lua
[+] Added 'g' flag for ParseAnimInt to get flag for target unit
[+] Added MissileOffsets array which allows more correct placing for missile's starting point (not from unit's center, but from cannon's hole etc.)
[+] Added CclGetUnitBoolFlag to get unit's bool-flags in Lua
[+] Removed speedup variables (SpeedResourcesHarvest, SpeedResourcesReturn, SpeedBuild, SpeedTrain, SpeedUpgrade, SpeedResearch) into player's code, now speedup could be set individually for each player
[+] Added CUpgradeModifier::ModifyPercent for modifying variables by percent, not by const value.
[+] Added MissileType::Pierce to allow missiles damage everything on their way
[+] Added map preview image generation function for editor (not ready for OpenGL yet)
[+] Added flag for CclCreateMissile to control missile's damage
[*] Missiles now fly into unit's center (according to the comment in code, the old behaviour was to be used for bunkers)
[-] Fixed random number generation code in animations
[-] Fixed "Flushing removed unit" message for boarded units
[-] Fixed unit death into container (happens when unit is temporary)
[-] Fixed land-only restriction for transporters
[-] Fixed "spell-cast" mouse action for non-enemy units (now it's possible to use this action for medics)
[-] Fixed compilation for MSVC9
2012-08-08 03:08:27 +06:00