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

427 Commits (40cbe8067b4b6d68e3a0d71a2fdf8ccd1101a44a)

Author SHA1 Message Date
Cyp 4e2f4bbf3c images: Make retreat setting buttons show colours of health bars. 
New images by aubergine.
 2012-12-23 13:47:44 +01:00
Berg 0d333a1a06 Update disabled uplink and lassat icons. 2012-08-21 13:31:13 +02:00
Per Inge Mathisen 087ab8c505 Fix missing decals in Rocky Mountains tileset that were specially made for it 
but never mentioned in the rockiedecals.txt file. It also fixes the ground
types of certain urban and rocky tiles to resemble the old 2.3 terrain more
exactly. Patch by NoQ. Closes ticket:3621
 2012-08-08 13:16:55 +02:00
Cyp 552a60b099 Add files missing from 1e5fafabb3. 
Fixes ticket:3646.
 2012-08-06 19:19:52 +02:00
Cyp 1e5fafabb3 Warn when uplink and/or lassat is disabled. 2012-08-05 23:03:24 +02:00
Cyp 26bb105885 Split frontend*.png and intfac*.png into individual images. 
The images are now combined into texture pages at runtime.

This should simplify adding/removing images.
 2012-08-05 22:33:34 +02:00
Cyp f879b83605 Correctly handle interface image texture pages which are not 256x256. 
Game logo now appears full size.
 2012-08-05 22:33:02 +02:00
safety0ff da433789c3 Use Berg's animated cyborg factory (GPL.) 2012-06-17 16:31:01 -04:00
dak180 02b99612b6 Pngs should be crushed, a lot. 
Preferably before being committed.
 2012-06-16 22:07:27 -04:00
safety0ff e636d41472 Use Berg's animated factory (GPL). 2012-06-16 20:25:23 -04:00
safety0ff 2d0a089bad Convert code and models from hard coded animation intervals to model defined animation intervals. 
Also assert on PIE files with bad animation data.

Closes #3539.
(cherry picked from commit 75ff2070dc)
(cherry picked from commit b3dc9444da8f453cbf03c418005bca58318e1ce3)
 2012-06-16 18:57:24 -04:00
Christian Ohm aca180e0e8 New skybox for urban maps. 
Closes #3534.
 2012-06-10 00:14:32 -04:00
Cyp 4a53a0e010 Texture changes by several people. 
Cliff decals by Jorzi, sand support by Mysteryem, new rocky ground texture by MaNGusT, minor tweaks by NoQ.

Cliffs should now be visible.
 2012-06-09 09:27:28 +02:00
Cyp 5b07a7b755 Add oil barrels to map preview. 2012-06-05 23:15:53 +02:00
Cyp f0eea79104 Fix Nexus AI unable to build units. 
Nexus was building units with an unresearched sensor (equivalent to the default sensor). Since
6365f2dbec, Nexus can no longer build unresearched units.

In the tutorial, the designed MG viper wheels would also use the same unresearched sensor.

Replaced unresearched DefaultSensor1Mk1 with ZNULLSENSOR. Removed special case for tutorial in
7079ad2951, which is no longer required.
 2012-05-21 16:05:10 +02:00
Cyp e36cdf11e8 Fix tcmask on Plasmite Flamer, Sunburst AA and AA Flak Cannon. 
Fixed by running simplipie.

Could not fix Naval propulsion, which seems to be missing the tcmask.

Fixes ticket:3433.
 2012-05-07 19:18:59 +02:00
vexed 4a9ac7fc3e Update the building textures. 
Thanks to Berg for the update.
 2012-05-06 22:54:29 -04:00
vexed e50d51339e Fixes Scavenger MRAs 
Patch by NoQ
Original model by Berg

Fixes ticket:3365
 2012-04-28 16:16:22 -04:00
cybersphinx c01be7695c Remove trailing commas from the research messages. 
Also remove the workaround to remove the resulting empty strings
introduced in 9799722c79. Refs #3039.
 2012-04-09 23:25:50 +02:00
Cyp 73f089c217 Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD. 2012-03-25 12:58:59 +02:00
vexed 589b5abbe8 Use lower-res textures as default. 2012-03-12 20:45:31 +01:00
buginator 9d8e7ce9bc Muzzle flash fix for Assault Cannon & Cluster/HEAP Bomb projectile's texture fix 
and
fix TCmask for Plasmite Flamer AA Flak Cannon Sunburst AA Rocket Array

Closes ticket:3243.

Author: Black Project

(cherry picked from commit 54646f040ac71360cefe9e847a5e3eec86c4fc7a)

Conflicts:

	data/base/components/weapons/trmair2.pie
	data/base/components/weapons/trmair3.pie
	data/base/effects/fxvulcan.pie
 2012-03-04 18:08:25 +01:00
cybersphinx 391ffb621e Fix radar/unit design in campaign for away missions. 2012-02-10 20:37:18 +01:00
cybersphinx 97a7c6a1da Change new PIE modes to use flags instead of connectors. 
Introduced in 82e00bf7747af4962a32b67e4215d40298bbf9b3:

  Roll to camera uses TYPE x1x instead of a "1 x 0" connector.

  Pitch to camera uses TYPE x2x instead of a "2 x 0" connector.

  Additive uses TYPE xx1/xx2 to dis/enable instead of a "x 1 0"/"x 2 0" connector.

Introduced in f3ba2378e54ab0557db4a20c876043f8be059906:

  Premultiplied uses TYPE xx4 instead of a "x 3 0" connector.

Refs #3024.
 2012-02-10 19:40:19 +01:00
cybersphinx 4a71db9e9b Add general rules script for the campaign. 
Enable design and minimap only when an HQ exists.
 2012-02-03 23:38:25 +01:00
cybersphinx 0e382794a5 Update team colours to correspond to their names better. 
Refs #2972, tc2.patch. No teal for now, since that would introduce new
strings.
 2012-01-29 20:41:23 +01:00
Per Inge Mathisen 2f84b60214 Remove --self-test command line option, as it was not maintained properly over a very long time. 2012-01-21 17:02:08 +01:00
Per Inge Mathisen 80951e250f Remove utterly useless "specialability.txt" 2012-01-15 18:18:42 +01:00
cybersphinx 4219e43bcc Remove some unused duplicate data files. 2012-01-15 00:31:23 +01:00
cybersphinx 779b4edcbd Move multiplayer files to data/mp. 2012-01-15 00:23:16 +01:00
Per Inge Mathisen c907d5ab1c Temporary hack to fix T2/T3 for now. Basically just ignoring attempts to research 
things that do not exist (instead of having lots of unreachable techs that do
nothing, which was the previous state). Remove duplicate script code for setting
amount of starting power; as a side effect starting power may be less now for
T2/T3. Will fix that later when scripts know the T2/T3 state. Closes ticket:3044
 2012-01-14 23:44:29 +01:00
Per Inge Mathisen e688e0aa81 Challenges: Can now override player names, and turn off players entirely. 2012-01-14 22:49:44 +01:00
Per Inge Mathisen a5dffde59e qtscript: Added new event when owned objects are destroyed. Rules Script now 
controls whether minimap is shown or not.
 2012-01-14 19:39:54 +01:00
Per Inge Mathisen 97d8d791a9 qtscript: Rename orderDroidStatsLoc() to orderDroidBuild(). The old version 
will remain available for a while to give people time to convert.
 2012-01-12 19:12:22 +01:00
vexed 96fdff1ca8 Upload forum member Jorzi new credit screen. 2012-01-11 22:38:34 -05:00
vexed ac550acd58 Revert the new bsonlobby. 
Closes #3040.

Revert "Remove bson from project files."

This reverts commit 5c24f7b716.

Conflicts:

	lib/netplay/netlobby.h
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj

Revert "Merge branch 'refs/heads/topic/QJson'"

This reverts commit 6dd85baedf, reversing
changes made to 7d349eb214.

Conflicts:

	Makefile.am
	lib/netplay/netlobby.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff"

This reverts commit f76e960f7d.

Conflicts:

	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/gamelib/gtime.cpp
	lib/netplay/netplay.vcxproj
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj
	win32/Warzone2100.sln

Revert "Fix SSL errors on the Macs."

This reverts commit 4c387a199b.

Revert "Merge branch 'bsonlobby' into master"

This reverts commit 793c30a862, reversing
changes made to 5fa33b7209.

Conflicts:

	data/makefile.win32
	lib/netplay/netlobby.cpp
	lib/netplay/netlobby.h
	lib/netplay/netplay.cpp
	lib/widget/label.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	po/POTFILES.in
	src/configuration.cpp
	src/frontend.h
	src/multiint.cpp
 2012-01-08 23:10:26 +01:00
Per Inge Mathisen a695355881 Remove tabs and fix missing braces in research message data. 2012-01-07 19:33:06 +01:00
Per Inge Mathisen 545eb5c272 Convert research message data to ini file format. 2012-01-07 19:14:34 +01:00
Cyp 555cb0dfa7 Fix CAM3C script from failing at start. 
No idea why it used to work.
 2012-01-07 18:41:54 +01:00
Per Inge Mathisen ce950ddff3 semperfi js: Attack random enemy, for more fun. 2012-01-03 18:31:30 +01:00
Per Inge Mathisen b4b870cd09 Remove unused techs from multiplayer to reduce clutter. 2012-01-03 17:47:13 +01:00
Per Inge Mathisen e7bcabc655 semperfi js/qtscript: Check templates against factory body size limit. 
Handle multiweapon droids properly, and build them. Fix attack code.
Demolish unused research labs when done. Prioritize rocket techs.
 2012-01-02 21:52:48 +01:00
Per Inge Mathisen 5a1411dd87 semperfi js: Now builds attack droids, and sends them to attack occasionally. 
Workaround bug where you cannot research stuff in the first few game ticks.
 2012-01-02 00:13:25 +01:00
Per Inge Mathisen dee0307296 Add the new Semperfi javascript AI as a separate AI choice 2012-01-02 00:13:25 +01:00
Per Inge Mathisen 0770df9855 semperi js: Now builds cyborgs and VTOLs, and sort of defends itself. 2012-01-01 15:09:34 +01:00
Per Inge Mathisen f35de0d513 qtscript: Generalize attacked event to cover droids as well. Fire off droid built 
event also if droids are built through cheating. Make trigger function names consistent.
 2011-12-30 20:48:40 +01:00
Per Inge Mathisen 2d304e1985 qtscript: New trigger 'eventStructureBuilt' 2011-12-30 20:35:10 +01:00
Per Inge Mathisen efc9481beb qtscript: buildDroid() can now take preference lists of components, not just 
individual component strings. You can use this to easily build the best
possible droid, without manually checking component availability.
 2011-12-30 20:01:45 +01:00
Per Inge Mathisen 5dca124ba0 qtscript: You can now pass a list of techs to pursueResearch. It will pick the 
first one not already researched to pursue.
 2011-12-29 19:50:06 +01:00
Cyp 11cd71892d Replace cross-shaped projectiles with flat projectiles that rotate to face the camera. 
Number of triangles reduced by 75%.

Also, laser beams are no longer opaque.
 2011-12-29 17:19:28 +01:00