Commit graph

7975 commits

Author SHA1 Message Date
Pali Rohár
64e6b3830c bzr merge lp:~stratagus/stratagus/sourceforge 2010-10-18 17:56:07 +02:00
Jarod42
ce93ccc1a9 Fix some warning 2010-10-18 12:33:59 +00:00
Jarod42
ece1edbe71 Fix compilation 2010-10-18 12:33:35 +00:00
Pali Rohár
75953fe1aa Do not drop goods after unit stop working 2010-10-17 19:08:07 +02:00
Pali Rohár
d0167b3ccc Fixed problem with building oil platform 2010-10-17 16:12:41 +02:00
Pali Rohár
df90d1595b Fixed bug 645194: oil tanker disappears when it builds a oil platform 2010-10-17 14:34:32 +02:00
Pali Rohár
45fe4f673a Do not assert unknow mouse button, rather show error message 2010-10-17 14:29:17 +02:00
Pali Rohár
7b08dbe318 Fixed compilation warnings
Automatically enable flags -Werror and -fno-exceptions in debug mode
2010-10-17 14:16:57 +02:00
Pali Rohár
ae1515a1ab Fixed version info in Windows NSIS Installer 2010-10-16 18:56:50 +02:00
Pali Rohár
b9002ed7ac Fixed crashing in OpenGL mode
Fixed crashing at exiting game
2010-10-15 16:09:51 +02:00
Pali Rohár
119effc50a Windows NSIS Installer - Make INSTDIR writeable 2010-10-14 23:15:18 +02:00
Pali Rohár
24c923b77c Fixed function WINAPI_AttachConsole 2010-10-13 01:13:20 +02:00
Pali Rohár
d18ff34904 Compile fix on Maemo 2010-09-20 16:51:51 +02:00
Pali Rohár
62412984b7 Release 2.2.5.4 2010-09-20 15:39:46 +02:00
Pali Rohár
795aed9bff Relicense all files to GPL v2 2010-09-20 15:39:29 +02:00
Pali Rohár
bdcafb4678 Fixed flags in Rules.make.in 2010-09-20 15:37:25 +02:00
Pali Rohár
d4ac7b3c5f Patch stratagus.diff from https://bugs.launchpad.net/stratagus/+bug/635069
Gcc Warnings

fixed a lot of gcc warnings while also extending the warnings flags
removed unused variables
fixed use of unitialized variables at a few places (e.g. graphic.cpp - j isn't initialized)
2010-09-20 15:18:02 +02:00
Pali Rohár
b3097da7eb Fixed generating LDFLAGS in configure.in 2010-09-09 16:36:06 +02:00
Pali Rohár
fb71b5a463 Do not show waypoints for enemy units (when SHIFT key is down) 2010-09-09 10:11:38 +02:00
Pali Rohár
b2397c05f2 Fixed deleting OpenGL textures (patch from boswars upstream) 2010-09-09 09:26:21 +02:00
Pali Rohár
b283218a5f Added configure param --enable-maemo to force building for Maemo 2010-09-09 09:25:34 +02:00
Pali Rohár
39ebc594c1 Rename files in debian/
Fix Maemo section in debian/rules
2010-08-27 17:36:18 +02:00
Pali Rohár
c173e9c9aa Show trigger messages only in debug mode 2010-08-27 17:35:23 +02:00
Pali Rohár
842e9d832e Added Lua function SetMenuRace which set race of cursor in main menu 2010-08-13 15:40:25 +02:00
Pali Rohár
170df2525d Fixed function CursorByIdent in src/video/cursor.cpp
This function does not correct search for cursor if there are more races
2010-08-13 15:34:06 +02:00
Pali Rohár
77ff728df5 Release 2.2.5.3 2010-08-11 11:17:26 +02:00
Pali Rohár
153aaffb9a Fixed make strip in Makefile
In build-win32-cross.sh strip stratagus.exe and compress with upx
2010-08-10 11:35:43 +02:00
Pali Rohár
a0ec4a5375 Windows NSIS Installer
- use LZMA compression
 - pack Installer EXE header with upx
2010-08-10 11:33:12 +02:00
Pali Rohár
0abad20221 Fixed Windows NSIS Installer
- Use MUI2 instead MUI 
 - Use only register 0 instead R0
 - Use relative instruction jumps instead label jumps
 - Do not allow start installer twice
 - Do not allow uninstall Stratagus if some Stratagus games are installed (e.g. Wargus) (force with param /P in UninstallPrevious section)
 - Check for installed games in HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Stratagus\Games
2010-08-09 13:58:09 +02:00
Pali Rohár
07b1557cd3 Updating doc/ChangeLog.html 2010-08-08 08:48:00 +02:00
Pali Rohár
499d5ffc13 Added CPPFLAGS to windres
Moved version information from src/include/stratagus.h to src/include/version.h
Added Lua function GetStratagusVersion() which return Stratagus Version (C Macro VERSION)
Added Lua function GetStratagusHomepage() which return Stratagus Homepage (C Macro HOMEPAGE)
Added VersionInfo to Windows Resource file for stratagus.exe
Fixed VersionInfo in Windows NSIS Installer
Added support for playlist music in menu too (before only supported in running game)
2010-08-07 15:43:34 +02:00
Pali Rohár
e3fd2f70c8 Fixed correct URLs in Windows NSIS installer and others 2010-08-06 14:12:09 +02:00
Pali Rohár
7b945d6c66 Patch stratagus-r8003-vc90.patch from http://sourceforge.net/tracker/?func=detail&aid=2895148&group_id=84903&atid=574267
patch to compile and run stratagus using VC2008 - ID: 2895148

Issue 2. unit.h: undefine NOUSER for VC2008
Fixes compiler error under VC2008.
Changes the code to undefine macro NOUSER in unit.h before including windows.h, otherwise clipboard related functions and structures will be undefined. Also removes duplicated and confusing windows.h includes in util.cpp.

Issue 4. unit_draw.cpp: memset caused access violation
Fixes acess violation when loading Wargus scripts at startup with stratagus RELEASE build.
Function DecorationCclRegister() in unit_draw.cpp use memset to re-initialize C++ object, which breaks internal data structures of STL vector. However, this access violation will only occur when compiled with VC2008 RELEASE profile.
Using vector's clear() method to re-initialize DecoSprite, replacing memset,

Issue 5. minimap.cpp: fix minimap
Fixes minimap showing wrong terrain when playing a game in Wargus.
Two different semantic are used inconsistently to calculate minimap index in minimap.cpp, One is mx + my, the onther is mx + my * Map.Info.MapWidth. This inconsistency causes cause minimap to show wrong terrain.
Changes the code in minimap.cpp to use the first semantic consistently.

Issue 7. loadcamp.cpp: Cleaning Order
Fixes access violation on exiting the game or close the game window directly in DEBUG build.  
Because stratagus.exe try to do a clean exit when compiled with DEBUG profile, which frees a bunch of allocated resources in loadcamp.cpp CleanModules(). But the order seems problematic, causing memory access violation when exits.
It seems that CleanUnitTypes() and CleanPlayers() must be called after CleanUnits(), since UnitType and Players structures are used when cleaning units.
    
Issue 8. mainloop.cpp: Parallel drawing     
Fixes keyboard and mouse issue in a Wargus game: user can't issue any command with keyboard or mouse after the game is started.      
Parallel drawing seems not working under Windows. When run stratagus under a dual-core processor, keyboard and mouse click event cannot be received by GameLogicLoop.       
Changes the code in mainloop.cpp to use only 1 cpu under WIN32.
2010-08-03 16:51:57 +02:00
Pali Rohár
6c82dc4874 Patch net-bind.diff from http://sourceforge.net/tracker/?func=detail&aid=1682872&group_id=84903&atid=574267
Allow setting the address when binding the sockets - ID: 1682872

On a box with several network interface it might be desirable to bind only on a specific address.
This patch add a new command line option (-I) to do that.
2010-08-03 15:49:33 +02:00
Pali Rohár
61cea7db75 Patch stratagus-fog-of-war-color.patch from http://sourceforge.net/tracker/?func=detail&aid=1580841&group_id=84903&atid=574267
Configurable Fog of War color - ID: 1580841

Adds a configuration option,
SetFogOfWarColor(red,green,blue) and document it in
doc/scripts.
        
Applies to SVN code as of 2006-10-19.
2010-08-03 15:13:49 +02:00
Pali Rohár
8d735a7def Add function IsMusicPlaying() to Lua 2010-08-03 14:53:12 +02:00
Pali Rohár
f59783afdf Text fixes
Fixed launchpad URLs in doc/*
2010-08-02 17:52:16 +02:00
Pali Rohár
9a4d6dd83b Fix info in debian/control 2010-08-02 17:51:21 +02:00
Pali Rohár
76bf2d5236 Fix creating debian/control file on Maemo 2010-08-02 17:50:23 +02:00
Pali Rohár
12bb89b488 Added Bugtracker line in debian/control for Maemo 2010-07-27 11:26:01 +02:00
Pali Rohár
52fa7dad5d Added libosso-dev dependences to debian/control 2010-07-27 11:05:23 +02:00
Pali Rohár
910af57d80 Release version 2.2.5.2 2010-07-27 10:52:00 +02:00
Pali Rohár
000e9a7a09 Do not call WINAPI_AttachConsole() twice (in src/video/sdl.cpp too) 2010-07-27 09:53:01 +02:00
Pali Rohár
f7fca8b2a4 Fix URLs in debian/control
Clean debian/changelog
2010-07-27 09:52:33 +02:00
Pali Rohár
a0f6d5ed21 When SDL_OPENGL is used, it is not possible to call SDL_CreateYUVOverlay
Turn temporary OpenGL off when playing movie, which use SDL_CreateYUVOverlay

This patch add support for playing movies in OpenGL mode
2010-07-15 13:08:36 +02:00
Pali Rohár
d577514c22 GLES Compile fix 2010-07-14 13:45:08 +02:00
Pali Rohár
8c7b097550 Compile warning 2010-07-14 13:30:28 +02:00
Pali Rohár
754062d5ed configure.in
- Revert back CPPFLAGS -Werror
 - Autodetect for theroa
 - Fix LUA includes
2010-07-14 11:51:13 +02:00
Pali Rohár
6faa23cba3 Clean GLES sections 2010-07-14 11:16:53 +02:00
Pali Rohár
6329e3bb13 On Maemo
- Link with library libosso, call osso_initialize
 - Call every 50s osso_display_blanking_pause for keeping backlight alive
 - Do not create WM icon, on Maemo is not supported
2010-07-14 10:33:28 +02:00