Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,837 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

9837 Commits (b3dcccba1dc0cedd7e2463a223875bf004a22cb7)

Author SHA1 Message Date
Buginator b3dcccba1d Fix MMB use. 
fixes ticket:2578

Also add mouse button state to LOG_INPUT
 2011-03-24 19:47:28 -04:00
Cyp 23f318fe39 Merge branch 'master' into qt 
Conflicts:
	lib/exceptionhandler/exceptionhandler.vcproj
	lib/framework/frame.h
	lib/framework/framework.vcproj
	lib/framework/input.h
	lib/gamelib/gamelib.vcproj
	lib/iniparser/iniparser.vcproj
	lib/ivis_opengl/ivis_opengl.vcproj
	lib/netplay/netplay.vcproj
	lib/script/script.vcproj
	lib/sequence/sequence.vcproj
	lib/sound/sound.vcproj
	lib/widget/widget.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
	src/Makefile.am
	win32/Warzone2100.vcproj
 2011-03-22 00:01:28 +01:00
Cyp fe4d13f335 Add Meta as alternative to Alt when giving scout orders. 2011-03-21 23:56:08 +01:00
Cyp e5a4039e8f Fix Shift+Tab and ` keys. 
Fixes ticket:2561.
 2011-03-21 23:13:41 +01:00
dak180 500f19b64b Update the dmg script. 2011-03-20 23:52:06 -04:00
dak180 cc55135ae5 Update the dmg scrpit. 2011-03-20 23:33:57 -04:00
dak180 817a598daa Get all the changes that were not brought over from master. 2011-03-20 21:46:01 -04:00
dak180 889d9e0c05 Use PhysFS 2.0.2 for the mac builds. 
Refs #1066.
 2011-03-20 18:46:09 -04:00
dak180 9e2c4933eb Use the autorevision script instead of the program. 
Refs #2401.
 2011-03-20 18:29:57 -04:00
dak180 ca42b5bd74 Add wzfs.h and wz2100icon.h to the xcode project. 2011-03-20 18:24:46 -04:00
cybersphinx 061b998171 Update translations. 2011-03-20 21:20:20 +01:00
Cyp eb9c58ded4 Fix AIs doing duplicate research, with multiple labs. 
The problem was lots of copies of buggy duplicate code.

Fixes ticket:2557.
 2011-03-20 21:10:02 +01:00
Cyp f2606e0c85 Fix read past end of images array when images changes from imagesBurningResource to imagesResource. 
Fixes ticket:2423.
 2011-03-20 04:16:02 +01:00
Buginator 12e1d13c6c Part 2: 
Fix overzealous BOOL->bool conversion

Structures *must* remain the same size, BOOL was initially cast as a int, and we would read/write values expecting 32bit values, needless to say, this caused issues. The same applies to varaiables that pretend to be a BOOL, and may indeed have been used as a bool, but again, the size is 32bits, not 1 byte.

Revert "fix [s]BOOLs bool by 4B0/\/\1|\|4710|\|" This reverts parts of commit a72c41aeec

fixes ticket:2556
 2011-03-19 21:52:25 -04:00
Buginator 405d03224c Fix overzealous BOOL->bool conversion 
Structures *must* remain the same size, BOOL was initially cast as a int,
and we would read/write values expecting 32bit values, needless to say,
this caused issues.
The same applies to varaiables that pretend to be a BOOL, and may indeed have
been used as a bool, but again, the size is 32bits, not 1 byte.


Revert "fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|"
This reverts parts of commit a72c41aeec

fixes ticket:2556
 2011-03-19 18:40:25 -04:00
Cyp 57cafbcf27 Add more hardcoded resolutions. 
Previous resolutions were {{42, 42}}, new resolutions are {{1920, 1200}, {1920, 1080}, {1680, 1050}, {1600, 1200}, {1440, 900}, {1280, 1024}, {1280, 960}, {1280, 800}, {1280, 720}, {1024, 768}, {800, 600}, {720, 576}, {720, 480}, {640, 480}}.
 2011-03-19 02:41:44 +01:00
Cyp 23fb1b0607 Show progress of ally research. 2011-03-19 00:34:44 +01:00
Cyp e762f8a564 Use IMAGE_PLAYERN instead of IMAGE_PLAYER0...IMAGE_PLAYER10. 2011-03-18 19:18:49 +01:00
Cyp 1d11ff30a7 Add IMAGE_PLAYERN and IMAGE_PLAYERN_HI, to replace IMAGE_PLAYER* and IMAGE_PLAYER*_HI. 2011-03-18 19:18:49 +01:00
Cyp a239f5829a Don't assert on player >= 8. 2011-03-18 19:18:49 +01:00
Cyp ac05a1376b Allow up to 4 ally research icons, in case everyone is researching the same thing. 2011-03-18 19:18:49 +01:00
Cyp c99d3661c3 Use team-coloured IMAGE_ALLY_RESEARCH and IMAGE_GENERIC_TANK icons. 2011-03-18 19:18:49 +01:00
Cyp ccab8415fa Add team-coloured blitting functions. 2011-03-18 19:18:48 +01:00
Cyp eb73b015bc Add IMAGE_ALLY_RESEARCH and IMAGE_GENERIC_TANK. 2011-03-18 19:18:48 +01:00
Cyp 95422949d3 Fix in-game multiplayer alliances menu showing droids which should not be visible. 2011-03-18 19:18:48 +01:00
Buginator 31502ccdce Let us try this again, leave the never-interactive option for the lexers. 
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in  2f780609.
cherry picked from commit c046bb88e5
 2011-03-17 21:35:07 -04:00
Buginator ab118527f0 add guards 2011-03-17 21:35:06 -04:00
Buginator 6b98cda4c0 Update .gitignore for new build system (VS2k10) 2011-03-17 21:35:05 -04:00
Buginator 466374d15d Populate some defines for MSVC (which we do nothing with anyway) 2011-03-17 21:35:03 -04:00
Buginator 0d4378c96f Add MSVC version guard, since this function is now included. 2011-03-17 21:35:02 -04:00
Buginator 518681e770 autorevision ... with some perl love 2011-03-17 21:35:01 -04:00
Buginator 5cfd2e9dbe Initial VS2k10 changes. 
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
 2011-03-17 21:35:00 -04:00
cybersphinx 109685fb90 Fix autorevision call in out-of-tree builds. 
Adapted from a patch by Quix0r, closes #2536.
 2011-03-17 18:41:10 +01:00
Cyp bceb057184 Use team colour for all parts of exploding droids, and don't make all exploding cyborgs contain miniture exploding green cyborg lancers inside them. 
Fixes ticket:2383.
 2011-03-17 12:06:43 +01:00
Cyp e6c9c4799c Simplify wall-dragging validity check. 
Not sure why validLocation is partially responsible for updating the build position.
 2011-03-17 10:33:20 +01:00
Cyp 6b70765f42 Remove extra check against building on water. 
Was preventing building derricks on oil wells near water and was preventing placing hovers on water in debug mode.

Fixes ticket:2325.
 2011-03-17 10:07:47 +01:00
Cyp 7c76ca4be1 Simplify checks a bit. 2011-03-17 09:56:05 +01:00
Cyp 7663966206 Change old-git warning message a bit. 
Final formulation of warning message thanks to input from cybersphinx, dak180 and Kreuvf (in alphabetical order).
 2011-03-16 19:23:15 +01:00
cybersphinx a56991c6d7 Update translations. 2011-03-16 19:01:50 +01:00
cybersphinx ac11eaac2c Set default framerate to 60 (really). 2011-03-16 15:51:09 +01:00
dak180 dde0d33f00 Raise a warning when working with an outdated version of git and attempt to work around it's limitations. 
Closes #2536.
 2011-03-16 10:47:53 -04:00
Cyp 564c5a4ee8 Fix "bool" and "bool" instead of "bool" and "BOOL" in scriptvals lexer, too. 
(Broke in a72c41aeec0136c86007739a97ccc9ed508c0283.)
 2011-03-15 21:49:22 +01:00
Per Inge Mathisen 59309f5e59 Set a more sane FPS default limit of 60, rather than 30. 2011-03-15 21:17:21 +01:00
Per Inge Mathisen ab3a8adf38 Remove unnecessary and spammy message about truck(s) ordered to build oil derrick. Closes ticket:2511 2011-03-15 18:57:24 +01:00
Per Inge Mathisen 8c69f5dc19 Clean up jump propulsion code. Fix warning in audio test code. Ref warnings from ticket:2531 2011-03-15 18:50:03 +01:00
Per Inge Mathisen 925730fb9a Fix MSVC warning in the telephone thingie code. Ref ticket:2531 2011-03-15 18:38:55 +01:00
Per Inge Mathisen 740364e296 Fix cast warning on MSVC. Patch by abomination. Closes ticket:2531 2011-03-15 18:15:24 +01:00
Per Inge Mathisen d1512538cd Fix string names in 1.10-balance mod 2011-03-15 18:09:08 +01:00
Cyp 896394ef6d Clear pathfinding data after shutting down pathfinding thread (instead of before). 2011-03-15 15:30:52 +01:00
Cyp 8ba7c625f0 Fix "bool|bool" instead of "bool|BOOL" in script lexer. 
(Broke in a72c41aeec0136c86007739a97ccc9ed508c0283.)
 2011-03-15 15:29:34 +01:00