1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,634 Commits 9 Branches 6 Tags
0a5ce33c08402cb6d41bbce9712729aeffce882e
Commit Graph
7634 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lalien 3a599c1e2f - loading screen stretching for all resolutions fixed 
- warning in GameSettings.cpp fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 13:55:06 +00:00
Wanne 18f2420a2e - Updated Version: 5520 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 13:31:48 +00:00
Wanne 79ad0085f8 - Deleted UB loadscreens (800x600 and 1024x768) 
- Added UB loadscreens in PNG format
- Updated SectorLoadscreens.xml comments

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1523 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 13:11:21 +00:00
Wanne 7a8475fb45 - Bugfix: If loadscreen does not exist, the filename was not outputted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 12:55:59 +00:00
Wanne 6671e0a8f8 - Bugfix: Fixed problem, that the correct loadscreen never was not found, although is exists 
- Cleaned up the Loading Screen.cpp file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 12:35:01 +00:00
Wanne 0308305d11 - The "Data-JA2Demo" MOD SVN trunk is located here: 
https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2_113_Demo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1522 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 09:14:24 +00:00
Wanne 82da158d85 - Moved the "Data-JA2Demo" MOD folder to its own SVN trunk: 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1521 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 09:13:25 +00:00
Wanne 114f0064c4 - Removed the "JA113NODEMO" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 08:15:20 +00:00
Wanne 061ea16cea - Removed the "ENABLE_DISPLAY_EXPLOSIVES" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 07:59:13 +00:00
Wanne 9fc9f09472 - Removed the "ENABLE_RIFLE_SLING" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 07:52:17 +00:00
Wanne 08eead9a2a - Updated GameDir for the UB Mods 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1520 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 01:58:21 +00:00
Wanne 306c4645b0 - Updated the file structure of the Unfinished Business 1.13 MOD 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1519 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 01:40:39 +00:00
Wanne 22bfe2a32c - Deleted the "Data-Files" and "Language" folder for the UB Mod 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1518 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 00:48:18 +00:00
Wanne 9f613f348d git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1517 4f8fa57e-7814-0410-bad4-adc449f26b7c 2012-08-24 00:36:36 +00:00
Wanne 564f296bab - Removed "VFS" folder 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1516 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 00:36:14 +00:00
Wanne 8bc7673947 - Added new default executables for the ja2 1.13 game and the map editor 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1515 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 00:05:46 +00:00
Wanne 4e97b713f1 - Added new folder structure for the UB mods 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1514 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-24 00:02:42 +00:00
Wanne f4b50f79c7 - Deleted old executable files. New ones will be uploaded soon ... 
- Deleted "Set JA2UB v1.13 Campaign.exe", because in the future the JA2 UB mods, demo and 1.13 can be started from the INI Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1513 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 23:43:48 +00:00
Wanne c29dcd7af0 - Updated ja2.ini, so each executable (113, ub, demo) has its own default executable file entry 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1512 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 23:40:10 +00:00
Wanne 2b98099a34 - Now every executable (1.13, UB and Demo) uses the ja2.ini file to initialize the game 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-23 23:33:26 +00:00
lalien e5d0e730e0 support for full screen main menu rev. 5498 
- removed obsolete images
- add new images
- fix xml file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1511 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 19:23:04 +00:00
Wanne c7343fd2f5 - Updated the "LayoutMainMenu.xml" files to the new format 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1509 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 18:22:28 +00:00
lalien 1abd491d46 support for full screen main menu rev. 5498 
- main menu background in png format


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1508 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 15:17:42 +00:00
Wanne 12517806c5 - Changed two MERC website options in the Data-1.13/Ja2_Options.INI 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1507 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 15:05:06 +00:00
Wanne 3961431e8d - Bugfix: Skyrider stuck in sector (Bugzilla #562) 
o I reverted the changes from revision 4724 and hopefully this fixes the "skyrider stuck in sector" bug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-23 14:54:23 +00:00
lalien e39afabcfd - support for full screen main menu rev. 5498 
- added full screen main menu image for all resolutions
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- obsolete xml tags not removed for compatibility with older versions
- only png images are functional




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1505 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-23 14:16:46 +00:00
lalien 56ae482ee2 - added full screen main menu image for all resolutions 
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- removed obsolete tags
- new buttons in main menu: "n" new game, "q" quit



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-23 14:08:42 +00:00
Flugente 544314276c - grenaded can now also be armed in the inventory like bombs 
- fix: underbarrel weapons no longer influence dirt generation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-22 19:54:35 +00:00
Flugente 7029b31da5 - added INI editor descriptions 
- added AP cost for arming boms in inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1504 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-22 19:52:31 +00:00
Flugente 30e13e1e26 New feature: The M.E.R.C. website now also has gearkits (by JMich) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-21 20:36:47 +00:00
Flugente 26df387c86 New feature: The M.E.R.C. website now also has gearkits (by JMich) 
- in order have multiple gearkits for mercs, you have to create them

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1503 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-21 20:35:43 +00:00
lalien b3dcd89ab4 - removed not needed loadscreen images 
- added images in png format


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1502 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-21 14:38:31 +00:00
Wanne b56d360c50 - Fixed the 3 workaround shooting animations (from revision: 1494 and 1499) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1501 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-21 12:02:12 +00:00
lalien 3136327c5a reapplied lost Russian letters fix from revision 4877 
-Fixed some problems with russian letters in IMP page (by ViSoR)
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-21 10:31:12 +00:00
lalien 82bfc8d9f4 added loading screen stretching for all resolutions 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-21 10:26:23 +00:00
Wanne 7e3b802ab6 - Fixed compilation error (in DecideAction.cpp), when ENABLE_ZOMBIES was enabled in builddefines.h 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-21 09:04:07 +00:00
Flugente 20b40ed761 - food system: auto consumption now starts at -10% instead of -25% 
- Moved key commands: 'Ctrl' + '.' now opens a message box. The commands to fill canteens and to clean weapons can be called from there. In the future, similar commands can be placed here

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-20 20:57:07 +00:00
Flugente d430eb638e added cleaning kits as random loot to enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1500 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-20 20:51:22 +00:00
Wanne a64d8a9323 - Fixed compilation error in Chinese version 
- Translated a few texts for Chinese version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-18 16:25:38 +00:00
Wanne 22eb3f259f - Workaround for the missing animations (M_SR_HIP_AIM.STI) which fixes the crashes in tactical when the animation was not found 
o Copy and renamed the animations (M_SR_HIP_AIM_ALT.STI to M_SR_HIP_AIM.STI)
o see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/309190/Searchpage/1/Main/20195/Words/M_SR_HIP_AIM.STI/Search/true/Re_A_Small_Compilation_of_New_.html#Post309190

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1499 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-18 16:06:41 +00:00
Flugente 63a6fbb279 added pic for cleaning kit (pics by wil473) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1498 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-18 00:58:02 +00:00
Flugente a17266e7b8 added repair kit to a few shopkeeper's inventories 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1497 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-18 00:23:20 +00:00
Flugente 8275a1231b New feature: advanced repair/dirt system 
- items now have an internal repair value that can be lowered through damage taken. They can only be repaired up to that value by your mercs, onyl smiths can fully restore it to 100%
- guns get dirty over time, especially when shooting. Thsi can cause them to jam. Use cleaning kits (item #1576) to clean them by pressing 'Alt' + '.'
- more on this feature in http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926
- this requires GameDir revision 1496 or higher

WARING! THIS BREAKS SAVEGAME COMPATIBIITY!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-18 00:03:40 +00:00
Flugente ecc8715b36 - added new icons, xml data and settings for the advanced repair/dirt system 
- more under http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1496 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-18 00:02:57 +00:00
Flugente 1c31f91963 fix: Game did not start because of unknown letter, replaced by simple 'e' 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1495 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-16 22:18:18 +00:00
Wanne 5f8718b3c7 - Workaround for the 2 missing animations (M_N_SHOT2.sti and S_N_SHOT2.sti) which fixes the crashes in tactical when the animation was not found 
o Copy and renamed the base animations (M_N_SHOT.sti and S_N_SHOT.sti)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/309138/Re_A_Small_Compilation_of_New_.html#Post309138

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1494 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-16 13:07:36 +00:00
Flugente 50b849997b - savegames prior to r5471 (Sandro's new features) are now compatible with the current version 
- fix: incorrect group deletion caused crash when switching from assignment to truck

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-15 19:54:36 +00:00
Flugente cddfbcb9f9 fix: vehicles no longer digest food, and no longer auto-consume food 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-14 23:36:34 +00:00
Wanne 1f1e45d394 - Fixed a typo in Items.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1492 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-14 17:01:38 +00:00
Wanne 3d491cc57d - Added the new <CrowbarModifier> Tag to the Crowbar and Rambo Knife (by JMich) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1491 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-14 17:00:36 +00:00