source

mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00

T

silversurfer 1e06d2a725 Bugfix for merc availability on M.E.R.C

When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6421 3b4a5df2-a311-0410-b5c6-a8a6f20db521

2013-09-19 16:57:53 +00:00

Console

cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)

2013-05-27 21:01:04 +00:00

Editor

- Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)

2013-09-16 06:22:00 +00:00

ext

Library Updates and 'ext' directory cleanup (by Buggler)

2013-08-24 20:42:14 +00:00

Laptop

Bugfix for merc availability on M.E.R.C

2013-09-19 16:57:53 +00:00

lua

- Updated VS 2008 project files (by tazpn)

2012-04-02 08:53:05 +00:00

ModularizedTacticalAI

cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)

2013-05-27 21:01:04 +00:00

Multiplayer

- new feature: backgrounds allow more personalisation of mercenaries

2013-09-03 20:55:33 +00:00

Res

Fixed Compiler Error: Replaced "#include afxres.h" with "#include "windows.h" in Res\ja2.rc, because it did not compile on a few machines.

2009-05-08 13:34:29 +00:00

Standard Gaming Platform

- Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)

2013-09-16 06:22:00 +00:00

Strategic

- externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler)

2013-09-17 14:44:55 +00:00

Tactical

Fix for new repair ease display

2013-09-18 20:03:18 +00:00

TacticalAI

Brief: //dnl ch71

2013-09-18 09:45:50 +00:00

TileEngine

Brief: //dnl ch68

2013-09-10 20:49:49 +00:00

Utils

Fix for new repair ease display

2013-09-18 20:03:18 +00:00

aniviewscreen.cpp

new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool.

2013-05-10 23:30:42 +00:00

binkw32.lib

************************************************************

2011-01-18 09:11:09 +00:00

builddefines.h

- Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)

2013-07-29 11:48:53 +00:00

Cheats.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Credits.cpp

- Removed the "USE_HIGHSPEED_GAMELOOP_TIMER" define. Now highspeed timer and new way of dequeuing events are always enabled when building an executable

2012-10-25 19:00:12 +00:00

Credits.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Fade Screen.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Fade Screen.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

fmodvc.lib

*********************************************************

2006-04-26 23:41:05 +00:00

GameInitOptionsScreen.cpp

- new feature: backgrounds allow more personalisation of mercenaries

2013-09-03 20:55:33 +00:00

GameInitOptionsScreen.h

************************************************************

2011-01-18 09:11:09 +00:00

gameloop.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

gameloop.h

- Made the "Highspeed timer game loop (FF-MOD by tazpn)" optional, so we can decide if we like to build an executable with/without the highspeed timer

2012-06-25 15:06:04 +00:00

gamescreen.cpp

- Improved LoadScreenHint feature

2013-09-12 11:09:25 +00:00

gamescreen.h

New attack busy system

2007-06-09 09:01:04 +00:00

GameSettings.cpp

New feature: When more than one merc is selected, they will keep their current formation. This behaviour can be toggled via [CTRL] + [Shift]+ [g].

2013-09-17 19:16:20 +00:00

GameSettings.h

New feature: When more than one merc is selected, they will keep their current formation. This behaviour can be toggled via [CTRL] + [Shift]+ [g].

2013-09-17 19:16:20 +00:00

GameVersion.cpp

- new feature: backgrounds allow more personalisation of mercenaries

2013-09-03 20:55:33 +00:00

GameVersion.h

- new feature: backgrounds allow more personalisation of mercenaries

2013-09-03 20:55:33 +00:00

German.vsprops

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

HelpScreen.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

HelpScreen.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

HelpScreenText.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Init.cpp

- Disabled the new music externalization code from revision 6296 (by Jazz)

2013-09-09 07:01:36 +00:00

Init.h

- Externalized 2 breathing values to APBPConstants.ini (by silversurfer)

2013-06-30 16:29:17 +00:00

Intro.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

Intro.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

ja2_Debug.props

************************************************************

2011-01-18 09:11:09 +00:00

ja2_Debug.vsprops

************************************************************

2011-01-18 09:11:09 +00:00

ja2_Editor.props

************************************************************

2011-01-18 09:11:09 +00:00

ja2_Editor.vsprops

************************************************************

2011-01-18 09:11:09 +00:00

ja2_Libs.props

************************************************************

2011-01-18 09:11:09 +00:00

ja2_Libs.vsprops

************************************************************

2011-01-18 09:11:09 +00:00

ja2_LinkerVS2005.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_LinkerVS2008.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_LinkerVS2010.props

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_VS2005.sln

- Fix: VS 2005 compilation: Dependency of ModularizedTacticalAI was not set for the ja2 project (Solution -> Properties -> Project Dependencies)

2013-06-14 07:54:00 +00:00

ja2_VS2005.vcproj

- UB Improvements / Cleanup (by Jazz)

2013-08-28 17:06:43 +00:00

ja2_VS2005Linker.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_VS2008.sln

- Updated project files

2013-04-14 22:58:58 +00:00

ja2_VS2008.vcproj

- Updated project files in VS 2008/VS 2010 (now it compiles again)

2013-01-27 23:21:54 +00:00

ja2_VS2008.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_VS2008Debug.vsprops

Updated VS 2008 Project Files (thx to BirdFlu)

2008-12-10 20:57:37 +00:00

ja2_VS2008Editor.vsprops

Updated VS 2008 Project Files (thx to BirdFlu)

2008-12-10 20:57:37 +00:00

ja2_VS2008Libs.vsprops

- Fixed compilation error in VS 2008 version (by tazpn)

2012-04-03 08:22:54 +00:00

ja2_VS2008Linker.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2_VS2010.sln

- VS 2010 Bugfix: Fixed LINKING error when compiling MapEditor version

2013-05-20 20:12:10 +00:00

ja2_VS2010.vcxproj

- VS 2010 Bugfix: Fixed LINKING error when compiling MapEditor version

2013-05-20 20:12:10 +00:00

ja2_VS2010.vcxproj.filters

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

ja2.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

ja2.props

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

ja2.vsprops

- Added the new project "ModularizedTacticalAI" to the VS 2005 solution

2013-04-14 21:03:23 +00:00

Ja25Update.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

Ja25Update.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

JA2 All.h

New attack busy system

2007-06-09 09:01:04 +00:00

JA2 Demo Ads.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

JA2 Splash.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

JA2 Splash.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

JA2Prototypes.h

Fix memory leaks in strategic pathing

2007-10-20 08:40:25 +00:00

jascreens.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

jascreens.h

************************************************************

2011-01-18 09:11:09 +00:00

Language Defines.cpp

- Added Chinese language support (thx to Noword from TBS)

2008-11-20 07:43:57 +00:00

Language Defines.h

Fix: wrong game language

2013-08-29 20:39:14 +00:00

legion cfg.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

legion cfg.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

libexpatMT.lib

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521

2007-06-29 10:40:05 +00:00

Loading Screen.cpp

- loading screen stretching for all resolutions fix

2012-08-24 14:45:25 +00:00

Loading Screen.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

local.h

- Developer feature: This is great for when in windowed mode eg development and your mouse is leaving the game window all the time to go to VS or another game instance on your desktop. (by haydent)

2012-10-02 07:41:43 +00:00

lua51.lib

Added Overhaul's Lua lib to the project. Now it works without Lua51.dll

2007-06-20 19:11:58 +00:00

lua51.vc9.lib

Updated VS 2008 Project Files (thx to BirdFlu)

2008-12-10 20:57:37 +00:00

MainMenuScreen.cpp

- Multiplayer: Fixed crash/freeze when clicking "Host" in the host screen

2013-06-14 00:12:11 +00:00

mainmenuscreen.h

- added full screen main menu image for all resolutions

2012-08-23 14:08:42 +00:00

MessageBoxScreen.cpp

- Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)

2013-09-16 06:22:00 +00:00

MessageBoxScreen.h

- a few dialogue box button texts can now be easily changed

2013-01-20 05:12:19 +00:00

MPChatScreen.cpp

- Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)

2013-09-16 06:22:00 +00:00

MPChatScreen.h

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

MPConnectScreen.cpp

- Improved LoadScreenHint feature

2013-09-12 11:09:25 +00:00

MPConnectScreen.h

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

MPHostScreen.cpp

- Fixed MERC hiring bug when reached max allowed mercs due to optional gear feature (by Buggler)

2013-05-13 20:24:21 +00:00

MPHostScreen.h

Merged Multiplayer UI patch from Zathras:

2009-03-19 15:31:55 +00:00

MPJoinScreen.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

MPJoinScreen.h

************************************************************

2011-01-18 09:11:09 +00:00

MPScoreScreen.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

MPScoreScreen.h

Merged Multiplayer UI patch from Zathras:

2009-03-19 15:31:55 +00:00

MPXmlTeams.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

MPXmlTeams.hpp

**********************************************************

2010-02-28 18:38:52 +00:00

mss32.lib

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Options Screen.cpp

- Improved LoadScreenHint feature

2013-09-12 11:09:25 +00:00

Options Screen.h

Merged Multiplayer UI patch from Zathras:

2009-03-19 15:31:55 +00:00

Path Debug.vsprops

Added profiler support

2007-10-20 06:56:34 +00:00

profiler.cpp

Added profiler support

2007-10-20 06:56:34 +00:00

profiler.h

Added profiler support

2007-10-20 06:56:34 +00:00

readme.txt

*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***

2012-03-23 18:46:54 +00:00

Roof Debug.vsprops

Added profiler support

2007-10-20 06:56:34 +00:00

Russian.vsprops

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

SaveLoadGame.cpp

- Improved LoadScreenHint feature

2013-09-12 11:09:25 +00:00

SaveLoadGame.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

SaveLoadScreen.cpp

Brief: //dnl ch68

2013-09-10 20:49:49 +00:00

SaveLoadScreen.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

screenids.h

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Screens.cpp

Forgot to commit the source changes in the last commit. Sorry. So, here they are.

2013-04-14 15:54:56 +00:00

Screens.h

Forgot to commit the source changes in the last commit. Sorry. So, here they are.

2013-04-14 15:54:56 +00:00

SMACKW32.LIB

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Sys Globals.cpp

- Fixes/Improvements to Option screen (by Arynn)

2009-04-10 10:36:08 +00:00

Sys Globals.h

- Fixes/Improvements to Option screen (by Arynn)

2009-04-10 10:36:08 +00:00

ub_config.cpp

- UB Improvements / Cleanup (by Jazz)

2013-08-29 11:53:39 +00:00

ub_config.h

- UB Improvements / Cleanup (by Jazz)

2013-08-29 11:53:39 +00:00

VtuneApi.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

VtuneApi.lib

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

XML_IntroFiles.cpp

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

XML_Layout_MainMenu.cpp

cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)

2013-05-27 20:38:52 +00:00

readme.txt

Last 1.13 SVN 4721



Compilation of UB :



Set #define JA2UB and #define JA2UBMAPS in file builddefines.h.



Compilation of JA2 :



Rem #define JA2UB and #define JA2UBMAPS in file builddefines.h.





Example :



UB :



#define JA2UB 

#define JA2UBMAPS



JA2 :



//#define JA2UB 

//#define JA2UBMAPS





www.legion.zone.zg.pl