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

319 Commits (45ecc06514a8e9f1bc99a0966d78f3ae6335b496)

Author SHA1 Message Date
Per Inge Mathisen 7fc26087cd Forgot to commit one file 2011-05-01 10:00:43 +02:00
Per Inge Mathisen 9bf8e6b917 Two new 2 player maps by NoQ. 2011-05-01 00:14:47 +02:00
Per Inge Mathisen ce4d83c972 Turns out sk*tech.*lo are entire superfluous, as their job is already done better by rules.slo 2011-04-24 16:00:54 +02:00
Per Inge Mathisen dda501bf13 Merge remote branch 'origin/master' into qt 
Conflicts:
	data/base/script/text/cam1a.slo
	lib/exceptionhandler/exceptionhandler.vcxproj
	lib/exceptionhandler/exchndl.h
	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/iniparser/iniparser.vcxproj
	lib/ivis_opengl/ivis_common.vcproj
	lib/ivis_opengl/ivis_opengl.vcxproj
	lib/netplay/netplay.vcxproj
	lib/script/script.vcxproj
	lib/sequence/sequence.vcxproj
	lib/sound/sound.vcxproj
	lib/widget/widget.vcxproj
	macosx/README.BUILD.txt
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Warzone2100.vcxproj
	src/main.cpp
 2011-04-17 23:17:24 +02:00
Per Inge Mathisen df4e48ec16 qt branch: Kill off the over-engineered tagfile format. Replacing it with the more retro ini file format. 2011-04-06 22:06:17 +02:00
cybersphinx b80e713648 Fix a bit of grammar. 2011-04-03 21:43:40 +02:00
Per Inge Mathisen 1ada89fb66 Remove unused wrf file 2011-04-03 13:59:50 +02:00
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 e2775918d3 House cleaning in scripts for cam1 first mission. 2011-04-03 12:24:35 +02:00
Per Inge Mathisen 6882a9a1a5 Remove unused data files 2011-04-03 12:24:18 +02:00
Per Inge Mathisen 6f6bf33588 Remove unused data files 2011-04-03 12:22:29 +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
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
Buginator eeb031e009 Fix campaign change level scripts broken in f78910162b 
Fixes ticket:872
 2011-03-31 19:05:38 -04:00
Per Inge Mathisen 6b4e5ec5b7 House cleaning in scripts for cam1 first mission. 2011-03-31 21:47:21 +02:00
Per Inge Mathisen 3c3a143702 Fix typo 2011-03-31 20:40:37 +02:00
Per Inge Mathisen 0ee8b860f8 Merge remote branch 'origin/qt' into qtscript 2011-03-30 18:05:40 +02: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 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 eb73b015bc Add IMAGE_ALLY_RESEARCH and IMAGE_GENERIC_TANK. 2011-03-18 19:18:48 +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
Per Inge Mathisen 47b11c81e7 qtscript: Scavenger script ported. 2011-02-06 18:19:05 +01:00
Per Inge Mathisen b4c8031d12 Merge remote branch 'origin/qt' into qtscript 2011-01-30 23:46:19 +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 fc0cdbdb29 Merge remote branch 'origin/qt' into qtscript 2011-01-30 23:42:52 +01:00
Per Inge Mathisen e86b70ade1 qt branch: Add application icon. Closes ticket:2465 2011-01-29 20:22:43 +01:00
Per Inge Mathisen 5244ea8c7a Fix timers. Initial work on game object representation. 2011-01-26 22:13:47 +01:00
Per Inge Mathisen c57bd507ed Add new unit test for model files, to check that they are in a valid PIE format. Remove unused and broken A* test. 2011-01-24 20:49:05 +01:00
Per Inge Mathisen c1f1c3e31d Initial test of qtscript 2011-01-23 22:30:57 +01:00
Per Inge Mathisen beeb1fb77e New backdrop image by jorzi 2011-01-23 21:44:04 +01:00
Per Inge Mathisen f30c15bf20 New script function BASEOBJ getDerrick(int) that returns indexed derrick objects. Can be iterated until it returns a NULLOBJECT. 
Modify semperfi to use this function for attacks of opportunity against undefended oil derricks.
 2011-01-22 14:01:30 +01:00
Per Inge Mathisen 45460926cf semperfi: Make AI build ripple rockets and archangels, and stormbringer AA. 2011-01-18 22:43:52 +01:00
Per Inge Mathisen 905323688e Retire the current AI top model template with heavy laser in favour of two new ones. First is armed with seraph missiles, the second with both seraph missiles and gauss cannon on a dragon body. 2011-01-17 23:33:49 +01:00
Per Inge Mathisen a61884fa1b There is no ECM in campaign. Add full text description of ECM tech. 2011-01-16 14:14:15 +01:00
Per Inge Mathisen 28c594d611 Make Dydo AI work with new MAX_PLAYERS limit. 2011-01-15 13:35:28 +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 5b9467d8d5 Add IMAGE_PLAYERN and IMAGE_TEAMN for N = 8..15. 2011-01-13 15:58:46 +01:00
Cyp 6f6ec2ea86 Add IMAGE_GN_N for N up to 15. 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 a7292473b6 Remove unused or duplicate data files. 2011-01-12 19:33:14 +01:00
Per Inge Mathisen a37b819a8d New difficulty icons by flail13 2011-01-10 21:29:53 +01:00
Per Inge Mathisen 0aa784b612 Forgot to commit the .ai file for Dydo. 2011-01-10 19:26:01 +01:00
Per Inge Mathisen d6ee18c895 New script function getDifficulty(int) to find which difficulty level a given player has. Also added four new 
constants to check against: EASY, MEDIUM, HARD and INSANE. Semperfi modified to be less nasty in easy and medium
difficulty levels.
 2011-01-09 22:24:09 +01:00
Per Inge Mathisen f263cf5103 Add GUI dialog for choosing which AI you want to play against. Move semperfi and dydo into main. Change difficulty 
slider into four separate steps (Easy, Medium, Hard, Insane). Thanks to Cyp for review. For more info, see ticket:2435
 2011-01-09 16:35:49 +01:00
Cyp b143d53ae1 Fix newly built human-player droids being partially unassigned from commanders by AI scripts. 
And make all factory attributes be written to the new droids.
 2011-01-09 05:22:54 +01:00
Per Inge Mathisen cfa47fbb70 Remove unused duplicates from campaign wz, and move three files only used in multiplayer to mp wz. 2011-01-08 17:05:11 +01:00
Per Inge Mathisen 7f5da6ad47 Use more of MAX_PLAYERS in the code rather than plain numbers. Define MAX_PLAYERS for scripts. From patch by Cyp. 2011-01-05 23:09:38 +01:00