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
Per Inge Mathisen 0372b01b80 House cleaning in campaign resource files. Removing unused directories. Adding an assert for them. 2011-04-03 13:57:48 +02:00
Per Inge Mathisen 09c023a2d0 Actually remove GLee files. 2011-04-03 12:39:44 +02:00
Per Inge Mathisen e6e4ebc60b Update POTFILES.in 2011-04-03 12:26:09 +02:00
Per Inge Mathisen 6f6bf33588 Remove unused data files 2011-04-03 12:22:29 +02:00
cybersphinx c754a40061 Yay! Removed files! 2011-04-03 03:22:16 +02:00
Per Inge Mathisen 0dae5eaee0 Add script functions to set mission timers and limits. 2011-04-03 00:23:28 +02:00
Per Inge Mathisen c261aca433 Remove now unused scav script files 2011-04-02 23:31:31 +02:00
dak180 df6e6dd669 Switch the xcode project from GLee to Glew. 
Refs #2378.
 2011-04-02 10:25:17 -04:00
Per Inge Mathisen de3be04ac5 Fix flickering due to face culling not being properly enabled. 2011-04-02 10:54:47 +02:00
Per Inge Mathisen 71ad7a8742 Various cross-compile and win32 stuff needed for glew. From patches by Safety0ff and cybersphinx. Untested. 2011-04-02 10:19:08 +02:00
Per Inge Mathisen 1fe2cc8f4d Use GLEW instead of GLee. Based on patch by cybersphinx. 2011-04-02 10:08:26 +02:00
cybersphinx 7615b183b3 Update POTFILES.in. 2011-04-02 03:33:25 +02:00
cybersphinx d5b95fe0cc Remove iniparser remains from src/Makefile.am. 2011-04-02 03:32:48 +02:00
dak180 bb40e5ea33 Remove the iniparser stuff from the xcode project. 2011-04-01 18:10:33 -04:00
dak180 92078012c5 Get rid of the remaining traces of Autorevision in the xcode project. 2011-04-01 18:07:56 -04:00
Per Inge Mathisen d78a8eb8ad Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load. 2011-04-01 20:31:15 +02:00
Per Inge Mathisen 1b0ae09320 Merge remote branch 'perim/qtscript' into qt 2011-04-01 18:32:40 +02:00
Per Inge Mathisen 6b4e5ec5b7 House cleaning in scripts for cam1 first mission. 2011-03-31 21:47:21 +02:00
Per Inge Mathisen 4425a81894 Merge branch 'dak180-topic/qtscript' into qtscript 2011-03-31 20:40:40 +02:00
Per Inge Mathisen 3c3a143702 Fix typo 2011-03-31 20:40:37 +02:00
dak180 34e6efd6d7 Slight cleanup of the xcode project. 2011-03-30 19:52:49 -04:00
dak180 24ca10f2f1 Add the new files to the xcode project. 2011-03-30 19:35:23 -04:00
dak180 9f4ea76a07 Fix an include so it works on the mac. 2011-03-30 19:29:38 -04:00
dak180 a31eab0ea0 Link QtScript.framework in the mac builds. 2011-03-30 19:21:52 -04:00
dak180 378ed56de6 Merge branch 'refs/heads/qt' into topic/qtscript 2011-03-30 19:03:59 -04:00
dak180 0f467ceacd Update the QT bundle. 2011-03-30 19:03:24 -04:00
Per Inge Mathisen 03618b8d2d qtscript: Save AI group information in the savegame. This may subtly break existing savegames. 2011-03-30 21:14:05 +02:00
Per Inge Mathisen 0ee8b860f8 Merge remote branch 'origin/qt' into qtscript 2011-03-30 18:05:40 +02:00
Per Inge Mathisen 5be9250bf8 qtscript: Save/load triggers. Fix scavenger loading. 2011-03-29 23:16:33 +02:00
Cyp 3bab849612 Half-fix trap cursor, can now be enabled/disabled, but cursor isn't completely trapped when enabled. 
Fixes ticket:2537.
 2011-03-26 21:10:48 +01:00
Buginator 13070ebc3e ignore moc generated files 2011-03-24 22:39:51 -04: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 8ffb1379f3 Clear openGL error codes before entry into the routine, since it was giving fasle positives. 2011-03-24 20:07:11 -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
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