1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,377 Commits 9 Branches 6 Tags
fc861e0ba1acaec135927cf75b76e3e731198973
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Flugente fc861e0ba1 - Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER) 
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-27 20:19:49 +00:00
Console
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Editor
Merged from revision: 7368
2014-07-30 17:19:47 +00:00
ext
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Laptop
- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
2014-09-27 20:19:49 +00:00
lua
- Fixed compilation error for Polish EXE
2014-06-30 19:02:05 +00:00
ModularizedTacticalAI
Merged revision(s) 7438-7439 from trunk/GameSource/ja2_v1.13:
2014-08-28 00:31:45 +00:00
Multiplayer
Merged from revision: 7436
2014-08-28 10:55:00 +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
Merged from revision: 7372
2014-08-05 17:03:16 +00:00
Strategic
Feature improvement:
2014-09-14 14:02:16 +00:00
Tactical
- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
2014-09-27 20:19:49 +00:00
TacticalAI
removed obsolete code
2014-08-31 20:42:20 +00:00
TileEngine
Fix: light sources did not decay in turnbased mode
2014-09-02 20:11:16 +00:00
Utils
- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
2014-09-27 20:19:49 +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
Externalized Difficulty Settings
2014-08-31 13:39:23 +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
Fix: error when building UB exe
2014-09-01 21:53:15 +00:00
GameInitOptionsScreen.h
removed obsolete code
2014-08-31 20:42:20 +00:00
gameloop.cpp
New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.
2014-06-27 22:12:29 +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
Merged revision(s) 7018 from branches/ja2_source_official_2014:
2014-03-03 21:03:36 +00:00
gamescreen.h
New attack busy system
2007-06-09 09:01:04 +00:00
GameSettings.cpp
- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
2014-09-27 20:19:49 +00:00
GameSettings.h
Externalised amount of debt to MERC at which Speck complains.
2014-09-13 15:08:30 +00:00
GameVersion.cpp
New Feature: IMP gear selection allows choosing what items an IMP starts with instead of relying upon randomness.
2014-09-23 22:46:10 +00:00
GameVersion.h
New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
2014-08-30 17:34:25 +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
Feature improvement:
2014-09-07 00:11:16 +00:00
Init.h
New Feature: Allow driving vehicles in tactical (by anv)
2014-05-06 08:46:26 +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_LinkerVS2013.props
Added VS2013 solution and project files (by JMich)
2013-11-21 07:57:52 +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
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +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
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +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
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +00:00
ja2_VS2010.vcxproj.filters
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +00:00
ja2_VS2013.sln
Added VS2013 solution and project files (by JMich)
2013-11-21 07:57:52 +00:00
ja2_VS2013.vcxproj
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +00:00
ja2_VS2013.vcxproj.filters
New Feature: Added up to 15 game difficulty settings (by Jazz)
2014-08-28 10:30:40 +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
Merged revision(s) 7254 from branches/ja2_source_official_2014:
2014-06-02 19:00:06 +00:00
Language Defines.h
set language back to english
2014-06-30 17:28:26 +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
Merged from revision: 7525
2014-09-17 18:46:09 +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
Merged from revision: 7372
2014-08-05 17:03:16 +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
Merged from revision: 7359
2014-07-22 16:40:02 +00:00
mainmenuscreen.h
- added full screen main menu image for all resolutions
2012-08-23 14:08:42 +00:00
MessageBoxScreen.cpp
Merged from revision: 6812
2014-01-22 13:28:48 +00:00
MessageBoxScreen.h
Merged from revision: 6812
2014-01-22 13:28:48 +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
removed obsolete code
2014-08-31 20:42:20 +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
Merged from revision: 7092
2014-03-19 11:50:06 +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: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
2014-08-30 17:34: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
Merged from revision: 7264
2014-06-03 18:45:07 +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
Turned WINFONTS macro into the ja2.ini property (USE_WINFONTS) (by scodec)
2013-10-13 19:02:27 +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
Externalized Difficulty Settings
2014-08-31 13:39:23 +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_DifficultySettings.cpp
Externalized Difficulty Settings
2014-08-31 13:39:23 +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
Fixes (by Moa)
2013-10-19 12:47:53 +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
1.7 GiB
Languages
Python 78.8%
C++ 18.2%
C 1.9%
Lua 0.6%
GAP 0.3%