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

58 Commits (348cdfcda829521b45dffdd307c881048f0448e0)

Author SHA1 Message Date
Per Inge Mathisen 6dc1ea15dd Remove unused order. Add new unused icons. Fix reticule tooltips. 
Remove some unused remains of internal map editor.
 2012-12-30 00:14:41 +01:00
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
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
Cyp 73f089c217 Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD. 2012-03-25 12:58:59 +02:00
cybersphinx 4f1b79d3d9 New icon for store/delete templates. 2011-12-19 00:52:12 +01: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 eb73b015bc Add IMAGE_ALLY_RESEARCH and IMAGE_GENERIC_TANK. 2011-03-18 19:18:48 +01:00
Per Inge Mathisen e86b70ade1 qt branch: Add application icon. Closes ticket:2465 2011-01-29 20:22:43 +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
Per Inge Mathisen a37b819a8d New difficulty icons by flail13 2011-01-10 21:29:53 +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
Buginator 3defb7a8da Thanks to the follow individuals for the new icons! Forum members "Jorzi" (kick icon) "CinC" (VTOL/NO VTOL icon) and "n2large0shirt" (Cyborg / no Cyborg icon) 
Thanks to Mysteryem for cleaning up the icons and doing some modifications as well so they all match the theme.

Cherry-picked from 934b5a4803efbc15159d07dc197424f63f3ec29e = 2.3@11710, resolved conflict by taking 2.3's data/base/images/frontend4.png and recrushing.
 2010-10-07 13:06:03 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
Christian Ohm b808df33f4 Fix transporter ETA image. 
Closes #2001.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11270 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-23 12:04:37 +02:00
Cyp a16c5f7df9 Show oil wells burning in the radar instead of pulsing. 2010-07-22 19:19:52 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
 2010-06-15 08:35:52 +02:00
Guangcong Luo 227d2c2de4 New cursors by Zerovirus and Zarel - attack-move cursor idea from Olrox. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10796 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-13 08:03:46 +02:00
Guangcong Luo a51f97c63e Improved AI slider. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10727 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-28 07:52:17 +02:00
Guangcong Luo 4282d92b3c Add "SCOUT" and "DISEMBARK" cursors. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10726 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-28 07:52:17 +02:00
Cyp 239e4e450d newnet: Display icon on desynch or on waiting for players. 
Saves having to look at console output to check that the game is in synch.
 2010-03-14 13:27:05 +01:00
dak180 72ccb7c384 PNG optimization, also known as 'Crush them all!'. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9038 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:04:21 +01:00
Guangcong Luo 84ba706499 New interface images: Attack-move and unload transport images, better North pointer, and correctly-aligned checkbox. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8802 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:52 +01:00
Guangcong Luo fbd286011c Remove "ready" text from ready checkbox image. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8715 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:44 +01:00
Guangcong Luo 5ba89a0f93 Better "ready?" checkbox. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8594 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 17:12:47 +01:00
Per Inge Mathisen 877e90e0ae Make use of the new scavenger icons. See discussion in ticket:1093 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8487 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-23 18:13:25 +01:00
Per Inge Mathisen 87a687e15c A small enhancement for GUI subsystem: target origin tracking system for structures (only for ones 
with weapons). If structure have some target for main weapon it will show appropriate icon on the 
right side of weapon reload bar/health bar. For now it can distinguish: visual contact targets, 
commander targets, sensor targets, CB sensor targets, counter radar targets, air defense targets.
Closes ticket:686, patch by i-NoD.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8022 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:11 +02:00
Christian Ohm 773c6f7a4e Add a north pointer for the rotating radar. 
This is i-NoD's reworked version. Closes #769.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8011 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:09 +02:00
Per Inge Mathisen 274b0483f9 Fix size of flashing timer box in campaign. This closes ticket:596 "Time ends warning quad is to small". 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7672 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:12 +02:00
Guangcong Luo 0429360f72 New Warzone logo created by Garrett Wiens-Kind <Neuralize>. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7601 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-01 21:19:55 +02:00
Guangcong Luo 9000a57144 Fix bug #541 - Uninstaller misses some files. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7544 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-28 09:59:31 +02:00
Buginator 395f677099 Properly fix intfac.img & infac.h 
After a short (*cough*) delay, finally add Zarel's new icons from ticket:247.  (fixes ticket:247) 

Move leave / disconnect icon to top(ish) right of screen.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7380 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-10 19:18:13 +02:00
Guangcong Luo ad647da647 "Player disconnected" and "Player left" icons. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7360 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-09 23:29:54 +02:00
Guangcong Luo 20f0ddc547 Team selector is now labeled "TEAM" and teams are colored and lettered A-H. The original numbers were changed to letters so they can no longer be confused with player numbers. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7142 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-24 14:16:07 +02:00
Buginator c2e5d2462f Adds password support to warzone. 
Adds feedback from the lobby server.

Notes: You have to enter a password *first*, and then either host the game, or join a game.

Thanks to elio for the new icons!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7079 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-19 23:45:25 +02:00
Guangcong Luo c74230d192 Commit patch #77 - Anti-aliased full-sized recolored cursors 
(It's been months... We really shouldn't sit on patches with no objections for this long...)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6656 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-17 05:57:08 +00:00
Dennis Schridde aac41748dc Bump copyright 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-10 18:01:48 +00:00
Elio Gubser fce4029e9d small changes in intfac1(hammer modified), intfac2(new weapon icon) and frontend2(nicer computer-ai) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5779 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-08-07 12:37:46 +00:00
Per Inge Mathisen eb3ac2e356 Fix bug #11911: two patrol buttons. Patrol now has a new icon, drawn by 
elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-07-16 12:06:26 +00:00
Elio Gubser 3695f6258b minor change of the power bar gradient 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5394 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-07-06 09:14:36 +00:00
Elio Gubser 147d658ade completed intfac1.svg 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5393 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-07-06 08:57:49 +00:00
Elio Gubser 7372b84341 Working on intfac2.svg, colours aren't correct in this version 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5392 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-07-06 08:42:19 +00:00
Elio Gubser 66e2bee6d3 main interface buttons finished 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5275 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-06-19 20:07:24 +00:00
Elio Gubser 364c32afea working on buttons, i replaced my close button with kreuvf's, copyright added 'Copyright (C) 2008 Steven Koenig (for the Close Button)' 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5267 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-06-18 19:37:31 +00:00
Elio Gubser ed4d0af31a working on main-ingame icons 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5252 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-06-13 20:41:11 +00:00