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

9879 Commits (0372b01b801b8f93a63cac949a0912621eca4563)

Author SHA1 Message Date
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
safety0ff 7e571f559d Add cmake toolchain file to files included with make dist. 2011-03-13 20:30:33 -04:00
safety0ff 133b1fcbcd Fix autorevision.h make dependencies. 2011-03-13 20:29:04 -04:00
Cyp e689ad51d5 Merge remote branch 'origin/master' into qt 
Conflicts:
	configure.ac
	lib/exceptionhandler/exceptionhandler.h
	lib/framework/SDL_framerate.h
	lib/framework/cursors.h
	lib/framework/input.cpp
	lib/framework/input.h
	lib/ivis_opengl/pieclip.h
	lib/ivis_opengl/screen.cpp
	macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
	src/console.cpp
	src/console.h
	src/frontend.cpp
	win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
 2011-03-13 22:31:19 +01:00
abomination b3d57fd490 Fix src\group.h(37): warning C4099: 'DROID_GROUP' : type name first seen using 'struct' now seen using 'class' src\droiddef.h(131) : see declaration of 'DROID_GROUP' By 4B0/\/\1|\|4710|\| 2011-03-13 20:34:10 +01:00
abomination a72c41aeec fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
 2011-03-13 12:32:24 +01:00
Cyp ad1fcb0c99 Remove some surviving “extern "C"”. 2011-03-13 10:30:13 +01:00
cybersphinx 90fa86f111 Merge branch 'dieautorevisiondie' 
Closes #2401.
 2011-03-12 22:25:07 +01:00
safety0ff 3dd8ff3e49 Add more informative link in pointtree comments. 2011-03-12 14:24:10 -05:00
safety0ff 5ac26462f1 Fix use of uninitialized variable in exception handler. 2011-03-12 12:23:56 -05:00
safety0ff 8ce810cda3 Use %u in printf statements instead of %hhu since Mingw (by default) uses Msvcrt's C99 non-compliant version. 
Using Mingw's C99 compliant replacement printf is possible but may be slow.
 2011-03-12 11:33:50 -05:00
safety0ff ad4a33a789 Fix capitalization of winsock2.h, not sure if this include is still needed (not present in master). 2011-03-12 10:19:04 -05:00
Per Inge Mathisen c7d206b6e9 Now run save/load of script state 2011-03-12 14:47:45 +01:00
Cyp f1ab1f092a Don't assert when firing lassat. 2011-03-11 21:10:17 +01:00
cybersphinx cce4f76dfc Proper dependencies for rebuilding of version.o. 2011-03-09 23:29:41 +01:00
cybersphinx c024ef4df2 Beautify. 2011-03-09 23:29:41 +01:00
cybersphinx e50b650c6c Just run autorevision unconditionally. 2011-03-09 23:29:41 +01:00