1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,503 Commits 9 Branches 6 Tags
f914a1da774322fe2d37b0c985ab742f4dd7e091
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Wanne f914a1da77 M.E.R.C Optional Gear (by Buggler) 
- Added MERC optional gear purchase
- Adopted Tais' gear cost format as previously gear cost uses MercProfiles.xml 'optional gear cost' value if hire without pressing any 'gear kit' button
- Added condition to settle bills first before hiring same merc from MERC
- Added MERC starting gear hotkey
- Fix for AIM starting gear hotkey when using old inventory
- Removed unused variable in fresh_header.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-11 20:24:36 +00:00
Console
- Updated VS 2008 project files (by tazpn)
2012-04-02 08:53:05 +00:00
Editor
- 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
ext
- Fixed random crashes in Vista and Windows7 (e.g: when starting the map editor, ...) when executable is compiled in VS 2010 (by Tais)
2012-07-04 23:34:47 +00:00
Laptop
M.E.R.C Optional Gear (by Buggler)
2013-01-11 20:24:36 +00:00
lua
- Updated VS 2008 project files (by tazpn)
2012-04-02 08:53:05 +00:00
Multiplayer
M.E.R.C Optional Gear (by Buggler)
2013-01-11 20:24:36 +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
- Removed HIGHSPEED_TIMER option from the ja2.ini. Highspeed timer is now always ON
2013-01-05 15:06:21 +00:00
Strategic
Fix: uninitialised variable could cause crash if subsequent checks failed
2013-01-05 21:35:22 +00:00
Tactical
BR Info Panel Enhancements (by Buggler)
2013-01-07 21:35:26 +00:00
TacticalAI
- New Feature: enemy assassins disguise as militia and can ambush player mercs
2012-12-30 19:20:36 +00:00
TileEngine
- enemy assassin feature is 'off' per default, in order not to freak out unwary new players
2013-01-03 01:33:29 +00:00
Utils
M.E.R.C Optional Gear (by Buggler)
2013-01-11 20:24:36 +00:00
aniviewscreen.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
binkw32.lib
************************************************************
2011-01-18 09:11:09 +00:00
builddefines.h
- 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
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
-Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire.
2012-11-09 08:10:23 +00:00
GameInitOptionsScreen.h
************************************************************
2011-01-18 09:11:09 +00:00
gameloop.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
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
- Removed the "JA113NODEMO" define
2012-08-24 08:15:20 +00:00
gamescreen.h
New attack busy system
2007-06-09 09:01:04 +00:00
GameSettings.cpp
New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
2013-01-06 03:51:09 +00:00
GameSettings.h
- external feeding checks for invalid gridno
2013-01-04 23:25:35 +00:00
GameVersion.cpp
-Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire.
2012-11-09 08:10:23 +00:00
GameVersion.h
New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
2013-01-06 03:51:09 +00:00
German.vsprops
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
HelpScreen.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +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
- external feeding checks for invalid gridno
2013-01-04 23:25:35 +00:00
Init.h
New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
2013-01-06 03:51:09 +00:00
Intro.cpp
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +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
************************************************************
2011-01-18 09:11:09 +00:00
ja2_LinkerVS2008.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_LinkerVS2010.props
- Updated VS 2010 project files to allow different ways for building the executable (by tazpn)
2012-04-02 08:51:48 +00:00
ja2_VS2005.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2005.vcproj
- Updated Version: 5520
2012-08-24 13:31:48 +00:00
ja2_VS2005Linker.vsprops
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
ja2_VS2008.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2008.vcproj
- Updated VS 2008 project files (by tazpn)
2012-04-02 08:53:05 +00:00
ja2_VS2008.vsprops
**********************************************************
2010-02-28 18:38:52 +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
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
ja2_VS2010.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2010.vcxproj
- Fixed random crashes in Vista and Windows7 (e.g: when starting the map editor, ...) when executable is compiled in VS 2010 (by Tais)
2012-07-04 23:34:47 +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
- Updated VS 2010 project files to allow different ways for building the executable (by tazpn)
2012-04-02 08:51:48 +00:00
ja2.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
Ja25Update.cpp
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +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
- 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
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
- Updated Version Number: 5387
2012-07-11 17:27:45 +00:00
legion cfg.cpp
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +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
Added features (by Buggler)
2012-11-05 09:12:14 +00:00
mainmenuscreen.h
- added full screen main menu image for all resolutions
2012-08-23 14:08:42 +00:00
MessageBoxScreen.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
MessageBoxScreen.h
New feature: Covert ops
2012-08-24 23:52:55 +00:00
MPChatScreen.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
MPChatScreen.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MPConnectScreen.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
MPConnectScreen.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MPHostScreen.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
MPHostScreen.h
Merged Multiplayer UI patch from Zathras:
2009-03-19 15:31:55 +00:00
MPJoinScreen.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
MPJoinScreen.h
************************************************************
2011-01-18 09:11:09 +00:00
MPScoreScreen.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
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
- 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
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
New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
2013-01-06 03:51:09 +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
Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10.
2012-05-24 19:41:11 +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
- 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
SCREENS.H
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +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
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
ub_config.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +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
- added full screen main menu image for all resolutions
2012-08-23 14:08:42 +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
Reference in New Issue View Git Blame Copy Permalink
S
Description
No description provided
Readme
57 MiB
Languages
C++ 90.4%
C 9.3%
HTML 0.2%
CMake 0.1%