Commit Graph

979 Commits (1b0ae0932005a955fc00225ac8f5cf49980bd01f)

Author SHA1 Message Date
Per Inge Mathisen 0ee8b860f8 Merge remote branch 'origin/qt' into qtscript 2011-03-30 18:05:40 +02:00
Buginator 60099b70d6 Revert "Fix MMB use."
open ticket:2578

This reverts commit b3dcccba1d.

Conflicts:

	lib/framework/wzapp.cpp
2011-03-24 22:36:01 -04:00
Buginator 1f5d94a564 Fix VS2k10 for Qt.
NOTE: All Qt headers *MUST* be before of the other headers, or else we get tons of conflicts
***
DO NOT CHANGE HEADER ORDER, unless you know what you are doing, it will fubar
other build systems!
****
close ticket:2570
2011-03-24 20:06:59 -04:00
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
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 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 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
Per Inge Mathisen 59309f5e59 Set a more sane FPS default limit of 60, rather than 30. 2011-03-15 21:17:21 +01: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 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
Per Inge Mathisen c7d206b6e9 Now run save/load of script state 2011-03-12 14:47:45 +01:00
Cyp a7730ccd15 Change "typedef struct {...} Blah;" into "struct Blah {...};".
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
Cyp 4a1b5fb543 Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:50:54 +01:00
Cyp ae2ce18314 Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
Per Inge Mathisen 5ea9d75ab2 qt branch: Soften font colours a bit to make them look more like master. 2011-02-06 22:41:27 +01:00
cybersphinx dc2385368c Merge branch 'master' into qt
Conflicts:
	lib/framework/frame.cpp
	lib/framework/frame.h
2011-02-05 18:44:00 +01:00
cybersphinx a236387ad1 Add missing include. 2011-02-05 18:35:56 +01:00
cybersphinx 1db938cd0b Set a window icon.
lib/framework/wz2100icon.h created from the 32x32 icon from
icons/warzone2100.ico by the Gimp's C code export.

Closes #2465.
2011-02-05 18:23:00 +01:00
Per Inge Mathisen 27741a2200 Merge branch 'master' into qt
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
	tests/astartest.c
2011-01-30 23:45:39 +01:00
Per Inge Mathisen 9344462e92 Add abstract file system interface for Qt access to physfs data resource. Thanks to EvilGuru for the idea and review. 2011-01-30 23:39:22 +01:00
buginator 87c9f38dc3 Revert "Add guard to YY_NO_UNISTD_H definition."
This reverts commit f1ebbe6eba.

Revert "Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd."

This reverts commit c046bb88e5.

see ticket:2444 for more info.
close ticket:2444
2011-01-30 01:40:53 -05:00
Per Inge Mathisen e86b70ade1 qt branch: Add application icon. Closes ticket:2465 2011-01-29 20:22:43 +01:00
safety0ff f1ebbe6eba Add guard to YY_NO_UNISTD_H definition.
Closes #2444.
2011-01-24 13:09:16 -05:00
Cyp d39112244b Merge remote branch 'origin/master' into qt
Conflicts:
	lib/framework/frame.h
	src/main.cpp
2011-01-22 23:05:36 +01:00
Cyp 3d5f96f199 Fix memory leak when saving config.
Fixes ticket:2455.
2011-01-20 21:26:00 +01:00
Cyp f99d9b20cc Make config file loading/saving less weird.
Changelog: Usernames such as "Meów" will no longer be truncated at the first unicode character to "Me" when restarting Warzone 2100.
2011-01-18 00:20:04 +01:00
safety0ff c046bb88e5 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.
2011-01-15 13:39:51 -05:00
Cyp 28f9830a63 Merge remote branch 'origin/master' into qt
Conflicts:
	lib/framework/SDL_framerate.h
	lib/framework/cursors.h
	lib/framework/input.h
	lib/ivis_common/Makefile.am
	lib/ivis_common/piestate.cpp
	lib/ivis_common/pietypes.h
	lib/ivis_opengl/imd.h
	lib/ivis_opengl/piestate.cpp
	lib/ivis_opengl/piestate.h
	lib/ivis_opengl/pietypes.h
	lib/sound/audio.h
	lib/sound/sound.vcproj
	lib/sound/track.h
	lib/widget/editbox.cpp
	lib/widget/scrap.h
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	src/Makefile.am
2011-01-14 19:26:55 +01:00
Cyp 8248789dfd Minor changes due to review by Per.
And also readded some changes that got lost from nexus.slo somehow.
2011-01-13 15:58:47 +01:00
Cyp f00b6149d9 Bump MAX_PLAYERS to allow 10 normal players + 1 scavenger player. 2011-01-13 15:58:46 +01:00
Cyp a3e5ea7276 Reduce dependence on MAX_PLAYERS == 8. 2011-01-13 15:58:46 +01:00
Per Inge Mathisen 9e9fc1ba5b Misc fixes for ticket:2435 (cleanup, cosmetic) to reduce diffcount 2011-01-09 14:46:18 +01:00
Cyp 4af4b82004 Use Vector2i in MOVE_CONTROL. 2011-01-08 01:30:57 +01:00
buginator 4ececd8e49 Fix a plethora of issues for MSVC builds
Rename MERGECOPY to MERGECOPYSYNC to prevent clobbering of a windows function named that.
2011-01-01 13:46:12 -05:00
buginator 1169f20b91 Merge branch 'master' of github.com:Warzone2100/warzone2100
* 'master' of github.com:Warzone2100/warzone2100: (41 commits)
  Remove some unused legacy code from the old terrain renderer and TERRAIN_VERTEX.
  Die, ivis_common, die\!
  Remove some unnecessary oil resource hacks, including flattening to terrain. Please do not put oil resources on sloped ground. It looks stupid even when flattened.
  Fix misspelling of 'guard tower' in PIE file name to match similar rename in wzgm.
  Remove the unused specular parameter to pie_Draw3DShape. It was always WZCOL_BLACK.
  Remove pietoaster
  Define the default fog colour in the palette file instead of hard-coded.
  Remove the "AI experience" code, which has not been used by the last four AI scripters. Existing savegames may be broken by this.
  Inline pie_SetTranslucencyMode() and remove the entirely superfluous TRANSLUCENCY_MODE abstraction.
  Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
  simplipie: Add warning when not all polygons in a mesh do not use the same number of frames for texture animation.
  Merge the two variants of piestate.cpp; it too confusing to keep two files with the same name doing almost the same thing.
  Slight optimization: Now we draw the entire model within the same glBegin .. glEnd pair.
  Remove support for non-triangle polygons in model files.
  simplipie: Fix error when fixing face culling and tessellation at the same time.
  Tessellate features, effects and other models.
  Tessellate components.
  Tessellate all structure models.
  simplipie: Fix missing space in frame animation directive print out.
  simplipie: Add support for triangle tessellation
  ...
2011-01-01 12:29:17 -05:00
Freddie Witherden 5362cf2217 Fix compilation under GCC 4.5.
Previously, _WZ_ASSERT_ARRAY_EXPR_FUNCTION would return NULL
((void *) 0) for a function with a declared return type of char.
2010-12-30 20:45:35 +00:00
Cyp 5c4b81fa63 Make C++ WZ_ASSERT_STATIC_STRING a compile-time check without using typeid, make C++ WZ_ASSERT_ARRAY_EXPR work. 2010-12-30 00:58:55 +01:00
Freddie Witherden fca489ce42 Iniparser rewrite as per ticket #2012.
This code completely replaces the old iniparser with a new,
cleaner API.  All existing uses of the old code have been ported.

The Xcode and MSVC projects will require updating.
2010-12-29 21:17:12 +00:00
Per Inge Mathisen 4eed3bef79 Remove the now obsolete distinction between configurable FPS rates for MP and campaign. Up the maximum FPS to 500 from 200.
To change the max fps rate now change only the "framerate" line. Patch reviewed by Cyp.
2010-12-29 00:24:45 +01:00
buginator e2c7c49a21 Merge branch 'master' of github.com:Warzone2100/warzone2100
* 'master' of github.com:Warzone2100/warzone2100:
  Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-24 20:02:10 -05:00
buginator e8d5913372 Apply patch — kill some more warnings, and fix a few issues that Buginator found. 2010-12-25 00:38:06 +01:00
buginator c43e15a14b Merge branch 'master' of github.com:Warzone2100/warzone2100
* 'master' of github.com:Warzone2100/warzone2100:
  Kill idiotic "'BOOL' : forcing value to bool 'true' or 'false' (performance warning)." warning.
2010-12-23 15:53:36 -05:00
Cyp 6a6b23e13b Kill idiotic "'BOOL' : forcing value to bool 'true' or 'false' (performance warning)." warning.
The compiler probably wasted more cpu cycles printing the warning than the conversion ever would.

Refs ticket:2431.
2010-12-23 21:38:18 +01:00
buginator 012029622d Merge branch 'master' of github.com:Warzone2100/warzone2100
* 'master' of github.com:Warzone2100/warzone2100:
  Try to fix the cross compile.
  Fix releaseBranch script to handle netplay.cpp instead of netplay.c.
  Simplify targetting projectiles.
  Fix WZ_DECL_CONST -> WZ_DECL_PURE on src/vector.h.
  Clean up some weird invalid PROJECTILE * -> BASE_OBJECT * casts.
  Make structures rectangular instead of circular for the purposes of projectile collision detection.
  Remove SPACETIME C wrapper around Spacetime.
  Remove redundant memset()s in loadGame.
  Use default constructors instead of memset for W_INIT (widget init) derivatives.
  Fix game saving/loading.
  Reset constructor upgrade between games.
  Remove ORDER_LIST_MAX and the corresponding 10 order limit to droid order queues.
  Use --debug=memory to see sizeof(...) for the various object types.
2010-12-22 22:47:40 -05:00