Commit Graph
942 Commits
Author SHA1 Message Date
Wanne 20c8fb646d - Bugfix: Reset the pressed keys (ALT, \) after the console opened
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-26 08:36:20 +00:00
Wanne 7fc0de5ccd - Bugfix: On "sell all" also unreachable items were sold (fix by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-25 18:20:08 +00:00
Wanne 178629d2c0 - Bugfix: Stop Time when Skyrider arrives in the destination sector (fix by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-22 19:39:44 +00:00
Wanne 7521db7ae7 - Bugfix: Need for soldier sleep was calculated wrong (fix by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-22 11:35:46 +00:00
Wanne 46cd01e366 - Merged Source Code from MP branch Revision 3021
. clip surface coordinates before blitting
. track surface data pointer, to identify the surface's clip rectangle
. editor : test if item index is smaller than the number of items 
. other minor updates
. update png loader to work with new appdata.xml structure
. VFS updates
. fix radar maps : write to <userprofile>\RADARMAPS

* New Map Editor Release (Build: 3023)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-19 15:19:49 +00:00
Wanne 1d3313182d Spread Patterns MOD (by Zilpin)
- VS 2008 Update

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3010 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-15 18:20:01 +00:00
Wanne 5cd81280bc Spread Patterns MOD (by Zilpin)
* You also have to update GameDir folder *

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-15 18:00:07 +00:00
Wanne f0424c1ef4 - Bugfix: Mine income was not correctly initialized in GameSettings (fix by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-13 09:46:15 +00:00
Wanne 772e77ffe3 - Added missing VFS\Tools files and folder.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3000 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-10 21:12:37 +00:00
Wanne e240037535 - Bugfix: Fixed CTD when item could not be rendered in the Editor Toolbar
- Fixed compilation error while compiling with disabled #define USE_VFS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-10 15:12:58 +00:00
Wanne 76b990f133 - Fixed compilation errors in VS 2005
- Updated Revision number: 2996

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-10 10:13:02 +00:00
Wanne 1c69e1a019 *** Merged Code from Multiplayer Branch Revision 2993 ***
- Updated VFS
- Fixed Map Editor not properly initialized with VFS
- New Map Editor Release (Build: 2993(


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-09 11:40:08 +00:00
Wanne 5291e3b127 - Bugfix: Console now works in VS 2008 (by SpaceViking and The_Bob)
- Bugfix: Reset the ALT + \ keys after opening the console in the SGP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-09 09:31:43 +00:00
Wanne fd947789f2 - Updated _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-07 02:23:46 +00:00
Wanne a3a69728ce New Map Editor Release (Build: 2975)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-06 22:28:46 +00:00
Wanne 23b3210d83 - Spelling mistake in _EnglishText.cpp
- Updated GameVersion.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-06 17:38:17 +00:00
Wanne aebc4f2e88 Bugfix: EDB Fix by Headrock
- Show Burst AND Auto penalty instead of only ONE (usually Burst penalty) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-06 16:47:31 +00:00
Wanne 3850e27bc5 - Merged Source Code from MP branch Revision 2972
enable intro videos in VFS mode
workaround for original intro hack
allow to get real path of a file (only CVFSFile)
streamline Allocator usage in VFile
small non-VFS mode fixes in MPHostScreen.cpp
Synced "Cutting Fences" in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-06 16:13:00 +00:00
Wanne 8c07f244f3 - Bugfix: Enhanced IMP Creation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-05 09:10:28 +00:00
Wanne 03c952f16a New Release EXE (Build: 2963)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 22:32:03 +00:00
Wanne 2d86d43817 - Bugfix: Enhanced IMP Creation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 21:15:34 +00:00
Wanne ff0067c983 - Added missing project file
- Added files to ignore list

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 21:06:49 +00:00
Wanne 47db604b50 *** Merged Code from Multiplayer Branch Revision 2960 ***
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 21:01:45 +00:00
Wanne 17f44f63e8 Corrected one sentence for Enhanced IMP Creation in the language specific text files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2957 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 17:27:54 +00:00
Wanne 7445ba2051 Merged "Enhanced IMP Creation" (by Sandro)
- For code changes search for // SANDRO
- Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option
- Updated Version Number for new Release Build (2949)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 10:44:23 +00:00
Wanne e983a0ccc6 Updated _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 18:49:01 +00:00
Wanne 5cb077f0e3 New Release Build (2929)
- Updated Build Number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2930 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 14:23:38 +00:00
Wanne 12f0ed5554 Externalized new messages for the Real-Time Mode
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 13:19:33 +00:00
Wanne 7367f5266a "Real Time Mode" update: Forgot the move the 2 new INI values to the [JA2 Tactical Settings] section
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 10:28:23 +00:00
Wanne afaba958c5 Added "Real Time Mode" (by borys762 and The_Bob)
- To look for code changes search for "The_Bob" comments
- There are 2 new entries in the ja2_options.ini in the [JA2 Tactical Settings] section: ALLOW_REAL_TIME_SNEAK, QUIET_REAL_TIME_SNEAK

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2921 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 10:25:42 +00:00
Wanne 2f36054c50 Updated language spec text files from MP branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2914 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-30 00:01:02 +00:00
Wanne f7e798aa01 Update comment for UDT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 12:44:18 +00:00
Wanne 6bf05babcb - Added Ultra Dynamic Tooltips by Telpscorei (to see the changes, search the code for //SCORE)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 12:43:45 +00:00
Wanne 128e7e7647 - Updated language text files from MP branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 08:43:11 +00:00
inshy 38fb47080c translated some english text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 06:37:33 +00:00
Wanne 895367162c - Bugfix: New Airport code was not working correctly for multiplayer version (merged changes from MP branch)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2883 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-24 20:50:18 +00:00
Wanne 8491b9b09b Code now handles localized version of ShippingDestinations.xml (German.ShippingDestinations.xml, Russian.ShippingDestinations.xml, ...) (by Arynn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-22 11:53:38 +00:00
Wanne c0ca3631f4 Updated _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-19 08:38:06 +00:00
Wanne 067a3a5899 Bugfix: Memory Leak in CIniReader::ReadString (by Arynn)
Fixed an array off by one issue in game setting structure (by Arynn)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-19 06:24:06 +00:00
SpaceViking 2208e05f65 Improve reading of boolean .ini settings
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-15 02:07:23 +00:00
SpaceViking bd74fac6cc Add checks around all use of bMercOpinion
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-13 22:32:44 +00:00
Wanne c8c547eba9 Updated translations of _ChineseText.cpp and _GermanText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-13 08:08:25 +00:00
Wanne 0e1c8b48bd Bugfix: Error occured when loading savegames with Release EXE compiled in Visual Studio 2008 (fixed by birdflu)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-13 07:59:49 +00:00
Wanne 2e99cbe784 Improved Game Settings (by Arynn)
- fixed corruption of ja2.set
- ja2.set will no be saved to ja2_settings.ini
- a few more minor game setting fixes and error tracings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-12 11:52:35 +00:00
inshy c9117c2939 With rev. 2837 all translated text (in rev. 2820) was replace with English. Be careful in the future, it is the not first case.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2842 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-12 10:55:37 +00:00
SpaceViking 46279f61b9 Change test for doors to use team ID
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-11 12:39:34 +00:00
Wanne 516e08e905 - Merged/updated text files from multiplayer project branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-11 11:26:38 +00:00
Wanne 4df4073cd0 Improved temporary Bugfix: Freeze when shippment from Bobby Rays arrive (by Arynn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-10 21:12:39 +00:00
Wanne 4e5939a289 Temporary Bugfix: Freeze when shippment from Bobby Rays arrive. It is only a temp fix, I don't know which side effects on the shippment this fix has.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-08 21:09:26 +00:00
Wanne 85c27b5d28 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2831 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2009-05-08 13:54:43 +00:00