2fb3d38b2c
Merge weapons and weapon sounds sections in weapons.ini file. Patch by Duha. Closes ticket:4021.
2013-05-20 22:23:10 +02:00
7d804bf8a4
Cleanup of console message for clicking on units and structures. Now
...
display amount of hitpoints instead of percentage of damage.
2013-05-20 22:13:37 +02:00
9c56cb10fa
Merge weaponsounds.ini into weapons.ini, as having this file separate made no sense.
2013-05-20 13:56:40 +02:00
9ac0e6ae4c
Merge cyborg bodies into two classes, light and heavy. This conforms to how
...
the guide explains it, and eliminates a number of ugly hacks in the code. It
should not change anything for the player.
2013-05-19 21:06:24 +02:00
b5fa742274
Add workaround for assert failure when designing a commander
2013-05-19 20:57:12 +02:00
310a84e767
Rename structure type "DOOR" to "GENERIC". This game has no blast doors.
2013-05-19 13:46:16 +02:00
d7df351d49
Add a new ability to structures, added as a flag, which requires it to be built
...
adjacent to another completed structure that this player owns. Thanks for NoQ
for code review. Closes ticket:4016
2013-05-18 21:54:38 +02:00
7901595c07
Remove old wzscript debugging watch window. Add new debug hotkey to test
...
temporary map reveal ability (by default shift+w).
2013-05-18 14:26:40 +02:00
23da1f1891
qtscript: Fix docs to reflect the .txt->.ini conversion
2013-05-18 09:21:33 +04:00
371ab04cda
qtscript: Add new functions addSpotter() and removeSpotter() to add and remove
...
temporary areas of vision on the map.
2013-05-18 00:30:58 +02:00
db5b44cb4a
Fix laser satellite weapon hack (got fire pause overflow).
2013-05-18 00:10:09 +02:00
40a95d5fee
Enhance informativity of unit limit messages.
2013-05-17 19:21:02 +02:00
fdb43a35f5
Introducing flags to weapons. Moving the arcane and arbitrary 'surfaceToAir'
...
field to new flags 'ShootAir' and 'AirOnly'.
2013-05-16 00:10:02 +02:00
0e06dd0741
Remove some icky manual memory management for propulsion IMDs
2013-05-15 23:29:54 +02:00
76e174c514
Add results from Cyp's code review
2013-05-13 23:14:34 +02:00
e7e643c05b
Fix possible crash bug, remove useless casts to const chars, and remove duplicate macro getStatName().
2013-05-13 23:11:34 +02:00
7fae836060
Fix two memory leaks
2013-05-13 22:55:56 +02:00
911d02e24f
Remove useless statRefStart(), statType() and componentType().
2013-05-13 22:20:49 +02:00
c14a32f481
Remove useless getCompFromResName()
2013-05-13 21:59:12 +02:00
100f5e9560
Use 'names' fields in ini files instead of looking up names in names.txt
2013-05-12 23:50:57 +02:00
9c8f362c2c
More data cleanup
2013-05-11 23:51:49 +02:00
50dbe29194
Re-implement WzConfig as a wrapper around QSettings.
2013-05-11 11:47:55 +02:00
6fe1c207e9
Remove some old unused data
2013-05-10 20:17:09 +02:00
5990846eac
Remove unused TableView code
2013-05-10 14:06:42 +02:00
364938d55a
Convert features to ini file format
2013-05-10 14:03:08 +02:00
6e5d836079
Run astyle over component.cpp
2013-05-10 12:09:14 +02:00
6c43f8c04a
Put matrix start and end in the same scope to avoid matrix stack underflow
...
when dealing with strange components.
2013-05-10 12:05:21 +02:00
cc6c30b1a6
Restore backwards compatibility with 3.1-based scripts that assumed specific values
...
for the first parameter of the old version of componentAvailable().
2013-05-10 12:03:46 +02:00
678e281b50
Convert templates to ini file format. Thanks to Duha for file conversions.
...
This closes ticket:4005.
2013-05-09 23:17:05 +02:00
bfb47fff4c
Simplify psDroid->asBits from array of structure with a single field to just an array.
...
This makes it identical to the template array asParts which does the same thing.
2013-05-09 13:25:40 +02:00
81b4c63a82
Remove unused weapon upgrade struct
2013-05-09 13:25:40 +02:00
36d0e3e7be
Trim size of template structure
2013-05-09 13:25:40 +02:00
8701e80a79
Remove useless template variable
2013-05-09 13:25:40 +02:00
4b9d59aa68
Send full droid info instead of bits of droid + reference to template
2013-05-07 18:45:10 +02:00
33cb37016e
FiX SoMe FoNt SiZe IsSuEs
2013-05-05 21:53:43 -04:00
9c1dd9cd38
Update & clean up MSVC project files because of 545832358b
2013-05-05 21:49:56 -04:00
2459f78bd5
Clean up component definition, remove useless COMP_UNKNOWN and wrong comments.
2013-05-05 20:50:51 +02:00
cb18ebcaa7
Account for the death of function.(cpp|h) and functiondef.h.
...
Also fix includes.
2013-05-05 08:11:37 -04:00
545832358b
Convert functions.txt to handle upgrades from within javascript and research.ini.
...
hackChangeMe() can no longer take -1, instead add new receiveAllEvents(bool) function
for that purpose. Campaign upgrades are not yet converted. All 'Power' settings in
ini files are changed, since they used meaningless values, to 'PowerLevel' with 0..2
values that correspond to button settings.
2013-05-05 13:34:59 +02:00
9fbf38f82b
Make jsdebug window update globals only on user request. This makes UI
...
much easier to work with, and prevents massive slowdown when big globals
are continuously updated in display.
2013-05-05 13:31:55 +02:00
1e6e097e7a
Fix off-by-one memory error
2013-05-02 20:20:47 +02:00
4551c63948
Make sure AIs do not disregard a research topic an ally is researching
...
in fixed alliance no-sharing mode.
2013-04-30 20:07:24 +02:00
8713039c5f
Add teams mode without shared research.
2013-04-29 21:20:34 +02:00
9e16fc5e1d
Move number of building modules (its "capacity") to parent class,
...
simplifying a great deal of code.
2013-04-17 00:15:04 +02:00
1b0032c337
Move max extra travel distance from missed projectiles to stats loading code.
2013-04-08 21:32:43 +02:00
cf9299ad8c
Remove broken counter-missile weapon type (probably never worked).
2013-04-08 21:23:07 +02:00
40647c5cad
Misc cleanup, mostly forward ported from uncommitted qtscript patches.
2013-04-07 17:16:08 +02:00
97377e98e1
Merge branch 'bugfixes'
2013-03-30 22:53:09 -04:00
acfe83cdf6
Try to filter out bad maps
...
fixes ticket:3982
2013-03-30 22:44:37 -04:00
404b9eaab9
This change made it rather difficult, if not impossible to fine tune where you are trying
...
to build/place things.
fixes ticket #3918
Revert "Change locate mouse in 3D function to not rely on static global. Finally remove tileScreenInfo."
This reverts commit 0d91966f54
2013-03-30 22:09:19 -04:00
e0df2d42fc
Update solution files for the required MOC(ing) of widgets broken in 64c2fde0dd
2013-03-30 21:56:12 -04:00
c4f03621fd
qtscript: Change eventResearched() to always have 3 parameters, where the
...
new third parameter is player called. Second parameter may be null.
Remove unused power parameter for ECM. Remove some dead code.
2013-03-26 00:45:16 +01:00
07a8df0a33
Misc cleanup
2013-03-25 15:48:27 +01:00
367d2d96fd
Remove unused SWEEP and ERRATIC-DIRECT weapon movement types. Cleanup weapon loading.
2013-03-23 17:33:37 +01:00
2295bfe10b
clang build warning fixes
2013-03-17 17:25:56 +01:00
50efcff92e
widget: Don't clear stats of null pointers.
...
Fixes ticket:3981.
2013-03-16 08:37:56 +01:00
39f43a936d
widget: Fix copy/paste error in geometry of in-game quit screen.
...
Fixes ticket:3980.
2013-03-15 16:24:31 +01:00
c91644c3dc
qtscript: Add check that callback function exists for setTimer() and queue().
2013-03-15 09:52:06 +01:00
7c52f5cbe8
Fix clang warnings. Remove support for "campaign" multiplayer maps (never used).
2013-03-15 09:42:12 +01:00
a0874b2244
Fix clang warning
2013-03-15 09:41:50 +01:00
983d77d016
Clean up super sensor handling. The WSS is not a counter-battery sensor
...
since a while ago, so remove superfluous and bad checks.
2013-03-15 09:40:36 +01:00
64c2fde0dd
Merge branches 'bugfixes' and 'widget'
...
Conflicts:
src/ingameop.cpp
src/intelmap.cpp
2013-03-15 08:50:10 +01:00
5756a0fbe3
widget: Simplify some more of the game option interface code.
2013-03-14 17:57:43 +01:00
70e849c9a4
widget: Convert power level choice to a MultichoiceWidget.
2013-03-14 11:08:41 +01:00
5e541b53cc
widget: Simplify fancy button display and highlight code.
2013-03-13 19:05:50 +01:00
951ceb168c
widget: Simplify button rendering interface.
...
Converted some functions to member functions.
2013-03-13 18:24:30 +01:00
5208053034
widget: Centralise button rotation management.
2013-03-13 09:08:19 +01:00
b3008cf05c
widget: Move lots of complicated buffer management into a few member variables.
2013-03-13 08:57:13 +01:00
a637140537
widget: Remove CurrentStatsTemplate.
2013-03-12 10:22:42 +01:00
2521e71729
widget: Remove write-only RENDERED_BUTTON::Initialised and RENDERED_BUTTON::State, and related dead code.
2013-03-12 09:54:53 +01:00
1240e7c96c
widget: Remove unused and useless W_TABFORM.
2013-03-12 09:32:55 +01:00
685e77c884
widget: Convert the intelmap stuff from W_TABFORMs to ListTabWidgets.
2013-03-12 09:12:55 +01:00
43b62d5a7e
widget: Convert the transport menus from W_TABFORMs to ListTabWidgets.
2013-03-12 00:27:15 +01:00
2753aaab61
Add missing research items causing crashes in campaign. Closes ticket:3977 and closes ticket:3974.
2013-03-11 23:55:44 +01:00
c1b4cadb39
Add colour rendering mode to GFX class. Convert radar viewing frustum from glBegin to VBOs.
2013-03-11 23:20:04 +01:00
066ba771b7
Convert structure loading from csv to ini format. Based on patch by crabster / Reg312.
2013-03-10 21:29:35 +01:00
4194dbf27e
widget: Convert the design menu from W_TABFORMs to ListTabWidgets.
2013-03-10 14:29:28 +01:00
a446fcc43b
widget: Convert the limits menu from W_TABFORM to ListTabWidget.
2013-03-10 00:37:43 +01:00
34381f03fd
widget: Convert the keymap menu from W_TABFORM to ListTabWidget.
...
Removed a sort-of bubble sort.
2013-03-10 00:14:11 +01:00
052f577eec
widget: Convert the object menu from W_TABFORM to ListTabWidget.
2013-03-09 18:52:28 +01:00
f9f3bf2537
widget: Append cost to item name tip.
2013-03-08 21:37:56 +01:00
33fe25fc56
widget: Convert the build/research menu from W_TABFORM to ListTabWidget.
2013-03-08 20:46:19 +01:00
91d816962e
widget: Implement ListTabWidget, and replace a W_TABFORM with a ListTabWidget.
2013-03-07 17:18:48 +01:00
e3097c0415
Make mouseTarget() readable.
2013-03-05 23:59:02 +01:00
6e25b89653
Merge branch 'bugfixes'
2013-03-04 08:00:27 +01:00
2faeb8ffb4
Make sure that template designs contain only designable components. This closes ticket:3971.
2013-03-03 22:57:16 +01:00
a5e137adce
Remove unused cluster iteration code.
2013-03-03 13:52:47 +01:00
344abd205d
More astyle preparation for display3d.cpp, reducing the depth of some deeply nested scopes.
2013-03-03 13:52:47 +01:00
9d29f9c2b7
widget: Remove displayLoadSaveEdit() in favour of a plain W_EDITBOX.
2013-03-02 21:00:22 +01:00
17e107adb2
Fix division by zero in generating seabed for maps with only one tile of water. Fixes ticket:3972
2013-03-02 18:48:32 +00:00
26e352d040
widget: Remove displayText() in favour of plain W_LABELs.
2013-03-02 09:51:32 +01:00
25c01aa1e6
widget: Modify closed form dimensions.
2013-02-28 10:12:54 +01:00
c6274f3d33
widget: Make IntFormAnimate self-delete after closing.
...
This eliminates boilerplate code growing in src/hci.cpp for each animated form.
2013-02-28 10:07:36 +01:00
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
050c3c105d
widget: Simplify recursive widget logic and W_FORM/W_TABFORM special cases, remove unused variables.
...
Restore black background on ally research bars, missing from second-last commit.
2013-02-27 00:06:35 +01:00
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
c19c853b10
widget: Factor out usage of widgSetColour(), and remove it.
2013-02-26 00:24:53 +01:00
258cc99ebd
widget: Allow W_BUTTON to show images, without needing special display functions.
...
Also, clean up password form.
2013-02-25 19:25:05 +01:00
fa496777fb
Cleanup of display code, preparing for the astyle.
2013-02-25 11:02:47 +01:00
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
a98cf2ace7
qtscript: Add new event 'eventObjectRecycled(object)' for demolish and recycle actions.
2013-02-20 18:31:17 +01:00
07bb6f6246
widget: Replace displayMultiBut() with WzMultiButton class.
2013-02-20 09:50:21 +01:00
fcedae2fcf
widget: Unduplicate more W_TABWIDGET code.
2013-02-19 19:33:33 +01:00
002232ebd7
widget: Make W_TABFORMs less special.
2013-02-19 19:31:39 +01:00
a60f592fe1
widget: Replace WCLICK_GREY, WCLICK_LOCKED, WCLICK_CLICKLOCK with WBUT_DISABLE, WBUT_LOCK, WBUT_CLICKLOCK.
...
This makes more sense than translating between them.
2013-02-18 20:50:37 +01:00
cd1edd6396
Set shadows on/off only once each time setting is changed, not each frame.
...
Turn lights off when no longer drawing with lighting on.
2013-02-18 20:39:25 +01:00
7b7cb476be
Fix crash bug in radar VBO code when saving/loading the game. Ooops. Closes ticket:3954.
2013-02-18 20:00:57 +01:00
fc77e4e726
Use the GLM math library to keep a copy of the OpenGL matrix state. This saves us a ton
...
of GPU requests fetching matrix states all the time, since we keep track of it too.
2013-02-18 20:00:25 +01:00
f7de883d05
widget: Replace WBUTS_GREY, WBUTS_LOCKED, WBUTS_CLICKLOCK with WBUT_DISABLE, WBUT_LOCK, WBUT_CLICKLOCK.
...
This makes more sense than translating between them.
2013-02-18 18:35:07 +01:00
d69f336ec4
Do not set light parameters every frame (except Sun position). Fix bug
...
with light parameters not being reset between games. Closes ticket:3952
2013-02-18 17:20:59 +01:00
def1e4ffa5
Split radar frustum coordinate calculation from drawing operation.
2013-02-18 17:20:59 +01:00
7a3338ce39
Clean up unused code and parameters in radar drawing code.
2013-02-18 17:20:59 +01:00
b173b57a36
widget: Convert WIDGET::x,y,width,height to member functions.
2013-02-18 09:05:01 +01:00
20317c2a6f
Out of tree builds ? Who needs them. :P
...
refs: 372eff6693
2013-02-17 20:50:09 -05:00
372eff6693
Simplify build process by getting rid of bison/flex dependencies.
...
Fixes both MSVC and autotools (automake 1.12+).
Revert "Abort autogen.sh when automake 1.12+ is found."
This reverts commit 978ed8f1f9
2013-02-17 20:15:15 -05:00
6b274b1a7f
Fix problems with radar drawing.
2013-02-17 15:45:11 +01:00
9930a76c12
Port radar texture display to GFX class.
2013-02-17 13:45:06 +01:00
fa7454c00a
Port all VBO drawing other than PIE model and terrain to GFX class. This
...
also fixes GPU memory leak bug when changing skybox, hence closing ticket:3842.
2013-02-17 13:45:06 +01:00
17de2b46b8
qtscript: Add 'tilesetType' constant that says which type of tileset the map uses.
...
It is one of "CUSTOM", "ARIZONA", "ROCKIES" or "URBAN".
2013-02-17 13:45:06 +01:00
d9a4b51fac
Rename 'tileset' global variable to 'tilesetDir' for increased readability.
2013-02-17 13:45:06 +01:00
6291df3cd3
Fix addDroid component parameter numbers, patch by ... Per.
2013-02-17 16:26:25 +04:00
2f5d244b4c
widget: Convert WIDGET::display to virtual function.
...
Fixes a sign error in tabVertOffset for WFORM_TABBOTTOM.
2013-02-17 08:42:55 +01:00
6e43578992
Merge branch 'bugfixes'
2013-02-16 21:48:28 -05:00
031aaf31cc
Add a lobby filter to toggle between, showing all games or just your version.
...
(NOTE: Need a better icon)
2013-02-16 21:46:25 -05:00
08567bebfb
qtscript: Fix crash bug in findResearch(), if number of requirements is higher
...
than max number of players. Found by forum member Duha.
2013-02-16 22:35:18 +01:00
2b82a1e379
Do not bother setting glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE)
...
repeatedly, since this is the default value, and we never set it to any other value.
2013-02-16 21:35:48 +01:00
d93a799820
widget: Replace bitflag manipulation with WIDGET::show()/hide().
2013-02-16 11:20:55 +01:00
e6652b2ca8
widget: Use new/delete instead of widgCreateScreen/widgReleaseScreen.
2013-02-16 08:44:47 +01:00
c83f42ae10
Merge branch 'bugfixes'
2013-02-15 23:42:03 -05:00
303fba6bf5
We now only show games that are newer, or the same version. (Until the time we have a good way to filter games via GUI control)
2013-02-15 23:36:48 -05:00
292dca6ed8
widget: Replace WIDGET::psNext with WIDGET::childWidgets/parentWidget, move most clean up to ~WIDGET().
2013-02-16 00:37:30 +01:00
dc441fcc7f
Merge branch 'bugfixes'
2013-02-13 23:01:23 -05:00
cb246c9644
Slight cleanup of various commits ;; -> ;
2013-02-13 22:56:37 -05:00
6c90810776
Fix memory leak in effects
2013-02-13 22:56:36 -05:00
7a0cfe72da
Update project file to fix a few missing header files
2013-02-13 22:46:48 -05:00
591b00c0df
Draw backdrops and map previews with VBOs.
2013-02-13 23:06:39 +01:00
9ef70b7b8f
Cleanup backdrop display code.
2013-02-13 23:06:39 +01:00
4fa3552838
widget: Remove unused minor tabs from tab forms.
...
Tab forms had major and minor tabs, but only the major tabs were used, despite a lot of code all over the place for
handling minor tabs.
2013-02-13 10:36:41 +01:00
1286f91795
widget: Convert setTip functions to member functions.
2013-02-12 09:31:49 +01:00
5eea4631f4
widget: Remove widgStartScreen/widgEndScreen.
...
They did not seem useful, and widgStartScreen was only called from hci.cpp.
2013-02-12 09:11:14 +01:00
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
773e93365a
widget: Convert getState/setState functions to member functions.
2013-02-11 09:26:17 +01:00
c1cb8e4343
Merge branch 'bugfixes'
...
Conflicts:
src/ai.cpp
src/combat.cpp
src/mapgrid.cpp
src/mapgrid.h
src/projectile.cpp
src/qtscriptfuncs.cpp
2013-02-10 13:46:55 +01:00
7bd4da5cc9
Misc changes forward ported from GLM patch.
2013-02-09 21:37:50 +01:00
d5f3a2489c
qtscript: Fix a typo in getDroidLimit player argument.
2013-02-09 23:12:14 +04:00
0633524b76
qtscript: Fix a typo in structure health calculation. Fixes ticket:3930.
2013-02-09 22:31:57 +04:00
c825e9bf7e
Remove fallback mode. GLSL 1.20 or better is now required.
2013-02-09 14:18:56 +01:00
5c7788784b
Change gridStartIterate interface to safely allow recursive calls.
...
Probably fixes ticket:3894.
2013-02-09 12:33:00 +01:00
6ed3ad8052
qtscript: Fix addLabel() coordinates. Closes ticket:3932.
2013-02-08 23:19:44 +01:00
933c099ec1
Add gDebugger / apitrace debug markers. Remove unused code. Do more
...
aggressive caching of shader states.
2013-02-07 21:48:21 +01:00
d07ea7b8d0
qtscript: Make sure including subdirectories from AI script directory works again.
2013-02-05 20:49:40 +01:00
4b43e29dcc
qtscript: Remove useless 'player' column in jsdebug triggers tab.
2013-02-04 22:58:15 +01:00
f1e9e0211a
Fix compile warnings
2013-02-04 21:22:03 +01:00
cffec7feb5
Remove 'logical' cheat that did nothing.
2013-02-04 19:29:48 +01:00
ccc540b24e
qtscript: Add new cheat 'jsload' which allows you to load any AI script you
...
want from the 'scripts' directory in your write directory to run on the current
player. New script global 'scriptPath' holds the path to whereever you loaded
the script from, and is used automatically for include files. There is no longer
any need to specify any paths for include files if they are located in the same
directory as your main script.
2013-02-04 19:15:04 +01:00
457f53514b
Fix memory leaks in 'jsdebug' GUI code (hopefully all). Try to plug some more valgrind warnings.
2013-02-03 23:23:39 +01:00
cefde6d6d0
Have MSVC generated the needed moc files for eb21e8e847
2013-02-02 22:28:35 -05:00
6576ea2253
Fix valgrind warnings.
2013-02-03 00:46:39 +01:00
a4515e6bf4
Fix memory corruption bug due to dangling string pointer in video code.
2013-02-02 23:38:48 +01:00
ae6ea54cce
Compile fix for Windows
2013-02-02 22:50:52 +01:00
f95e7027ad
Run astyle over design.cpp
2013-02-02 22:47:48 +01:00
4f93d4bf6e
Clean up design.cpp
2013-02-02 22:34:16 +01:00
061d7c077d
Remove unused memory buffers and other unused code from interface display code.
2013-02-02 20:56:58 +01:00
686ee5496a
Un-generalize iV_DrawImageRect() into iV_DrawImageRepeatX/Y().
2013-02-02 20:38:13 +01:00
316124b05e
Reorganize some drawing functions to reduce size of public drawing API. Clean up window rendering.
2013-02-02 20:03:58 +01:00
ae82d627b3
qtscript: Add dynamic evaluation input box to debug GUI.
2013-02-02 17:18:08 +01:00
eb21e8e847
qtscript: Add debug window showing globals, triggers and labels.
2013-02-02 15:53:03 +01:00
aa213528c0
qtscript: Remove warning message if getObject() fails to find label.
2013-02-02 15:53:03 +01:00
ee5fb65705
More Windows platform fixes for strftime.
2013-02-02 15:53:03 +01:00
52943ff63b
Change research stats format to .ini
2013-02-02 15:39:23 +01:00
20edd9680d
Merge branch 'bugfixes', remote-tracking branch 'origin'
...
Conflicts:
data/mp/multiplay/skirmish/semperfi.js
lib/widget/widget.cpp
src/qtscriptfuncs.cpp
2013-01-31 21:14:11 +01:00
e38de7b642
qtscript: Add parameter checking for buildings that do not exist. Fix one such error in semperfi.js.
2013-01-31 21:11:36 +01:00
8785d287db
Hopefully fix builds on various platforms other than mine.
2013-01-31 20:19:05 +01:00
098dc84cee
Do not assert if object label points to does not exist. Instead, return null.
2013-01-31 20:08:25 +01:00
155d0b6027
qtscript: Fix typos in getLabel() and addLabel(). Closes ticket:3920.
2013-01-31 19:53:49 +01:00
a59a65afed
Remove unused function data variables
2013-01-30 09:36:38 +01:00
a5dfec8246
Fix typo in periodicalDamage patch.
2013-01-29 23:32:51 +01:00
404d4f7b31
Small cleanup of mission code.
2013-01-29 23:22:37 +01:00
9c3df96ec3
Fix 'let me win' cheat for campaign.
2013-01-29 23:17:42 +01:00
af0a16764a
Remove unused ECM power stats. Make ECM upgrades increase range instead.
2013-01-29 18:02:40 +01:00
a87b869d20
Run astyle over stats.cpp, and remove unused definitions from stats.h
2013-01-29 17:56:18 +01:00
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
2e74f39160
qtscript: Add transport droid as parameter to transport events.
2013-01-28 23:37:35 +01:00
39769eee7d
qtscript: Move 'armed' property into weapons array, and make it actually work.
...
We now share the code to check this with the GUI code. This closes ticket:3178.
2013-01-27 17:50:29 +01:00
f9bba7e331
qtscript: Throttle attacked event to once per second for each droid, instead of ten times as often.
2013-01-27 15:50:06 +01:00
bd94e3de58
Rename incendiary damage to periodical damage. Add separate weapon class,
...
subclass and damage effect for periodical damage. This closes ticket:3913
2013-01-27 15:13:20 +01:00
904be8a9b3
qtscript: Allow setting 'me' with hackChangeMe() to -1, and when 'me' is -1, make that script receive
...
almost all events unfiltered by player.
2013-01-27 13:40:30 +01:00
527888a580
qtscript: Add new events for mission transporter control. Renaming some old ones,
...
keeping an alias for the old names for a short while in case someone is using them.
2013-01-27 13:22:44 +01:00
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
29a79d727c
qtscript: Add DORDER_RECYCLE. Add optional filter parameter to enumLabels().
2013-01-27 12:26:53 +01:00
bf6daebb1b
widgets: Queue up clicks, such that all mouse clicks are processed.
...
The widgRunScreen() still only returns one value, so the effect of some mouse clicks is still lost, but a few less
mouse clicks should be randomly thrown away, now. Only the widget system currently reads the click queue.
Extending KEY_PRESSED, KEY_RELEASED and KEY_PRESSRELEASE with KEY_PRESSRELEASEPRESSRELEASEPRESSPRESSRELEASE didn't
seem like the optimal approach to fix the issue.
2013-01-26 17:48:54 +01:00
13e26da5fe
Misc cleanup forward ported for intdisplay.cpp
2013-01-26 14:06:03 +01:00
30886e207a
qtscript: Rename label() to getObject(), keeping an alias in place for label()
...
for compatibility. Also adding getObject(x, y) for getting a structure or
feature at given position, and getObject(type, player, id) for getting an object
by its unique ID. This latter form deprecates hackGetObj(). Adds some documentation
for the GROUP label type. Finally makes super cyborgs get DROID_CYBORG droid type
instead of DROID_WEAPON.
2013-01-26 13:18:24 +01:00
b1b60ba7a3
qtscript: Add two new functions related to transporter handling in campaign,
...
startTransporterEntry(x, y, player) and setTransporterExit(x,y, player).
2013-01-25 20:48:36 +01:00
3ed8a41803
qtscript: Reduce soft max limit for javascript invocations to 20ms (down from 50ms).
2013-01-25 20:30:02 +01:00
62dc6fbd96
qtscript: When asking for ALLIES or ENEMIES in enumRange() and enumArea(),
...
do not include features in the results. This closes ticket:3899.
2013-01-23 19:23:56 +01:00
a36578b018
qtscript: Change group insertions to remove existing group membership
...
instead of ignoring insertion if already member of a group, to make it
work the same way as in 3.1. This closes ticket:3902.
2013-01-23 19:15:39 +01:00
5e79c2381a
qtscript: componentAvailable() can now only take a single parameter containing the
...
component name - specifying the component type is now deprecated.
2013-01-22 21:52:39 +01:00
e01110d7cf
qtscript: Allow addLabel() to work on all label types. Speed up some object lookups with type info.
2013-01-22 21:26:49 +01:00
b6b6265e4e
allyresearch: Also show in the bottom menu, if allies are researching the same as us.
2013-01-21 22:48:19 +01:00
per
haoNoQ
Cyp
vexed
dak180
Per Inge Mathisen
automerge
crabster