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

103 Commits (master)

Author SHA1 Message Date
vexed b366d80ca5 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-01 22:48:12 -04:00
vexed 1498b6c40e Reformat some messages to fit correctly in the console area. 
Don't retry UPnP configuration after it failed, and while still in the game lobby screen.
(You need to exit out of the game lobby screen to retry UPnP configuration.)
Remove UPnP entry in router on game quit.
 2013-11-01 22:09:42 -04:00
vexed 2f217ab602 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-27 21:15:49 -04:00
vexed 8f4adda206 Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been modified so we can compile it without errors! 
Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.

closes ticket:4095
 2013-10-27 20:57:38 -04:00
per 086a0d907f Remove unused code related to old AI sliders. 2013-09-14 21:48:56 +02:00
per f58dd9357e Remove iV_DrawImageScaled, made unnecessary by more modern iV_DrawImage2() 2013-09-14 21:02:55 +02:00
vexed 770b5d45af Disable 'View Intro' when videos are not installed. 2013-08-10 20:30:40 -04:00
vexed db65c97c71 Add donation link 2013-08-10 19:20:19 -04:00
vexed 5cabf5826e Remove lines that caused asserts, and fix what the line to display what it displayed before. 2013-08-10 19:20:18 -04:00
per 100f5e9560 Use 'names' fields in ini files instead of looking up names in names.txt 2013-05-12 23:50:57 +02:00
Cyp 26e352d040 widget: Remove displayText() in favour of plain W_LABELs. 2013-03-02 09:51:32 +01:00
Cyp 6a71410927 widget: Replace intOpenPlainForm, intDisplayPlainForm and intClosePlainForm with IntFormAnimated class. 
Animation variables are no longer part of W_FORM.
 2013-02-28 08:29:08 +01:00
Cyp eb3b88ac1d widget: Remove W_FORM::aColours and associated WZ_DECL_UNUSED PIELIGHT *pColours spam throughout the code. 2013-02-26 10:45:50 +01:00
Cyp d87282ba96 widget: Remove no-longer-meaningful WIDG_MAXSTR. 
A QString generally isn't limited to 80 bytes.
 2013-02-24 10:06:51 +01:00
Cyp b173b57a36 widget: Convert WIDGET::x,y,width,height to member functions. 2013-02-18 09:05:01 +01:00
Cyp 1286f91795 widget: Convert setTip functions to member functions. 2013-02-12 09:31:49 +01:00
Cyp 84e3461ffc widget: Use QString internally. 
Previously, some strings were stored in fixed length static arrays, and others were stored as pointers to the
original (uncopied) data.
 2013-02-12 00:08:37 +01:00
per c825e9bf7e Remove fallback mode. GLSL 1.20 or better is now required. 2013-02-09 14:18:56 +01:00
Cyp c7c6534c7c Merge branch 'bugfixes' 
Conflicts:
	lib/widget/bar.cpp
	lib/widget/button.cpp
	lib/widget/button.h
	lib/widget/editbox.cpp
	lib/widget/form.cpp
	lib/widget/form.h
	lib/widget/label.cpp
	lib/widget/slider.cpp
	lib/widget/slider.h
	lib/widget/widgbase.h
	lib/widget/widget.cpp
	src/hci.cpp
	src/intdisplay.cpp
 2013-01-29 16:22:16 +01:00
Cyp 9a0f42905b widget: Try to eat less mouse clicks. 
The widgRunScreen() function now returns a std::vector, and the most important mouse clicks (on in-game menus, that
is) are less likely to be ignored.
 2013-01-27 12:35:45 +01:00
vexed 6c6fe7c38a Merge branch 'bugfixes' 
Conflicts:
	src/e3demo.cpp
	src/e3demo.h
 2013-01-16 15:44:22 -05:00
vexed e34e7e4e0c Seems time don't stop, so bump the year to 2013. 2013-01-16 15:34:57 -05:00
per 348cdfcda8 Add two new directives to campaign definition files: 'loading' that gives a level 
file to read, and 'package' that gives a .wz file in campaign folder to mount. Campaign
definition files can now also be read from 'campaigns' in the user write folder.
 2013-01-10 23:42:47 +01:00
per 8d3abffc65 Add another parameter to WzConfig's constructor to indicate whether it is 
expecting another file, and whether it should be created if not present.
This removes a spurious warning when opening maps without <map name>.ini
 2013-01-07 00:40:24 +01:00
Per Inge Mathisen b041fa119f Add basic infrastructure for selecting a campaign mod from inside the game. 
Now you can start each of the alpha, beta and gamma campaigns separately.
 2012-12-16 21:54:54 +01:00
automerge 5d7a773917 Merge branch 'bugfixes' 2012-12-10 08:00:33 +01:00
Per Inge Mathisen 06d971e0e3 Fix menu small text alignment issues. Had to remove some explanatory 
text from front menu. Changed screaming caps to sane capitalization.
 2012-12-08 14:51:26 +01:00
Per Inge Mathisen 7e18c73af4 Make insane difficulty give 2x power income to AIs. Add qtscript function setPowerModifier(power[, player]) 
to change the power modifier from scripts. Closes ticket:3820.
 2012-12-08 13:17:13 +01:00
automerge 4cca382a24 Merge branch 'bugfixes' 2012-09-10 08:00:17 +02:00
Cyp 47011db59e Scale logo to fit box. 
Fixes ticket:3667.
 2012-09-09 18:35:57 +02:00
automerge b63959268e Merge branch 'bugfixes' 2012-08-06 08:00:14 +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
automerge e219cd62bf Merge branch 'bugfixes' 2012-08-03 08:00:13 +02:00
Per Inge Mathisen 398f77ede0 No longer save default map, max players and map hash. Patch originally by vexed. Closes ticket:3618 2012-08-02 21:18:07 +02:00
automerge 59cb28115c Merge branch 'bugfixes' 2012-06-29 08:00:20 +02:00
safety0ff 7e3be754d4 Add settings / UI support for shaders without tex_env_crossbar (added in 64a3cc1). 2012-06-26 22:03:22 -04:00
Per Inge Mathisen 7bc528ebd7 Merge branch 'bugfixes' 
Conflicts:
	src/qtscriptfuncs.cpp
 2012-06-25 21:37:47 +02:00
safety0ff 691df6a183 Add shader toggle UI. 2012-06-18 19:44:38 -04:00
vexed 00f437c18d Merge branch 'bugfixes' 
Conflicts:
	src/structure.cpp
 2012-06-16 19:45:02 -04:00
vexed 1a7c1a41b7 Add missing vids message when they are not found 2012-06-16 18:57:22 -04:00
automerge c007bb9527 Merge branch 'bugfixes' 2012-05-07 08:00:13 +02:00
vexed 18216c60e7 Fix Skirmish loading 
fixes ticket:3451
 2012-05-05 13:00:10 -04:00
vexed c3218e7ecc Fix Fastplay 
Fixes ticket:3447
 2012-05-05 12:49:59 -04:00
automerge 6688d820d3 Merge branch 'bugfixes' 2012-04-27 08:00:18 +02:00
vexed 3bebe1a0d6 Try to fix the autogame hack by introducing a new bool to keep track of 
when we should be using the AI's templates.

This only works in debug mode!

TODO: Move the actual setting of this bool script side, in case the user picks
a AI that doesn't support the 'autogame' command.

close ticket:3369
 2012-04-26 20:42:40 -04:00
automerge d2f0082ceb Merge branch 'bugfixes' 2012-04-26 08:00:09 +02:00
vexed 7f54b33436 Trying to find out why savegames are being broken. 
Possibly helps in finding out why #3416 happens.

refs:3416
 2012-04-25 20:39:38 -04:00
automerge 0eeffa516b Merge branch 'bugfixes' 2012-04-24 06:00:10 +02:00
vexed d8789661fb Savegames are now stored by type. Campaign saves are located in savegames/campaign/ Skirmish saves are located in savegames/skirmish/ 2012-04-23 20:58:44 -04:00
vexed 7d5315e3ee Move NETinit() routines to better location 
refs #3395
 2012-04-23 20:58:42 -04:00