per
9a6fdec2b5
Annotate the OpenGL command stream better. Now using the new KHR_debug extension with
...
debug groups. Some functionality commented out until apitrace fixes a bug upstream.
For this functionality, GLEW version 1.10 or higher is required.
2014-01-25 13:39:07 +01:00
automerge
55bf05d085
Merge branch 'newbugfixes'
2014-01-20 08:00:04 +01:00
haonoq
016b717a43
Fix path concatenation bug in CheckInMap, don't forget to check out the skirmish folder.
2014-01-19 16:05:05 +04:00
haonoq
d289598813
Move random oil drum placement to rules.js
2013-12-22 15:43:17 +04:00
per
7b8cddf092
Version 3.2 requires OpenGL 2.0.
...
Remove unnecessary dependencies between ivis library and main source.
Add link test program to detect and prevent new unnecessary dependencies.
2013-12-14 17:33:32 +01:00
vexed
f29d13b4e8
Merge branch 'newbugfixes'
...
Conflicts:
data/mp/stats/weapons.txt
src/Makefile.am
src/ai.h
2013-12-07 21:26:19 -05:00
vexed
7c63763c5c
Check deeper for map-mods
2013-12-07 18:59:45 -05:00
per
e3be45d636
Move the tiny contents of iV_ShutDown() into screenShutDown() and shut down ivi.h and ivi.cpp
2013-12-01 17:46:24 +01:00
per
3830e1ae77
Clean up interface between framework, ivis_opengl and main, reducing dependencies that go the wrong way.
...
Removing unnecessary header file frameint.h
2013-12-01 17:29:16 +01:00
vexed
81cbe807bd
Merge branch 'bugfixes'
2013-11-27 21:18:59 -05:00
vexed
2050161600
When physfs finds issues with maps, throw up a POPUP about the issue, (which makes it a non-fatal error) and then ignore said file.
2013-11-27 21:18:32 -05:00
vexed
24c3ea5a7d
Merge branch 'bugfixes'
2013-11-25 20:41:19 -05:00
vexed
3eb4457e01
Make it more clear that the user needs to delete said file, since it unsupported or corrupted.
2013-11-25 20:38:24 -05:00
vexed
e37254f59e
Merge branch 'bugfixes'
...
Conflicts:
src/multiint.cpp
2013-11-20 20:42:09 -05:00
vexed
fdd2524f1b
Differentiate between maps and maps that have mods in them. Map-mods will now be shown in red on the lobby screen, and the map picker screen. It will show a red lamp next to the map if you join a game via IP or, you knowingly join a game that is hosting a map-mod.
2013-11-20 20:21:44 -05:00
vexed
8cff9973b9
Revert "map-mod fun"
...
This reverts commit ac9afb2721
.
(didn't mean to push this yet)
2013-11-19 21:47:55 -05:00
vexed
ac9afb2721
map-mod fun
2013-11-19 21:15:44 -05:00
vexed
b4b019aa5a
Merge branch 'bugfixes'
...
Conflicts:
src/init.cpp
src/multiint.cpp
src/power.cpp
2013-11-19 22:18:46 -05:00
per
143c5dafff
Reinitialize AI data and player names each time frontend is reloaded. This closes ticket:3994.
2013-11-17 16:02:07 +01:00
per
5f32c3eafe
Performance measurement hotkey added. Press ctrl+k in debug mode to grab a sample.
...
On level exit, it writes a .csv file with your samples. Also, for each sample it
writes a screenshot with a custom filename, so you can match up the sample with a
picture of what you sampled. For analysing where we have graphics performance problems.
2013-10-05 13:38:14 +02:00
per
b57d0688d0
Do not use unnecessary memory on atmosphere effects when no atmosphere effects are in use.
...
Based on patch by wolftrak in ticket:4079, closes ticket:4079
2013-09-28 21:19:15 +02:00
per
6a9ca8c0e8
Implement lazy loading of PIE files. There is no longer any need to add them in WRF files
...
before referencing them from stats or other files.
2013-09-07 16:27:36 +02:00
per
465894d7b9
Add possibility to give each model its own shader through a new optional SHADERS directive in the PIE file.
2013-09-02 20:28:34 +02:00
per
c0abe4efe3
qtscript: Add two new functions: showInterface() and hideInterface(). They currently
...
only serve to assist modifications of the reticule, but will eventually control
hide/show of the larger user interface widgets. Also fix alpha values on two reticule
images.
2013-08-02 21:53:53 +02:00
per
cd54d3880c
qtscript: Add setReticuleButton(id, tip, filename, filenameDown) to define the look of reticule UI buttons.
2013-08-02 21:53:53 +02:00
Cyp
714727e241
Allow designing and building obsolete tanks.
...
Since you sometimes might want to a bunch of cheap MG tanks as a decoy, even if you have twin AG researched.
Also, remove an unrelated uselessly-duplicated test in action.cpp.
2013-05-22 23:57:45 +02:00
per
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
Cyp
8713039c5f
Add teams mode without shared research.
2013-04-29 21:20:34 +02:00
vexed
97377e98e1
Merge branch 'bugfixes'
2013-03-30 22:53:09 -04:00
vexed
acfe83cdf6
Try to filter out bad maps
...
fixes ticket:3982
2013-03-30 22:44:37 -04:00
per
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
per
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
per
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
per
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
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 Inge Mathisen
89a8737371
Misc accumulated cleanup and dead code removal.
2012-12-30 13:24:12 +01:00
Per Inge Mathisen
6d4f3720bc
qtscript: Ported the majority of the cam1a campaign script. The opposition AI
...
script remains still. There are a few changes: When you have power income, the
campaign timer is started to prevent cheating power by letting level run until
you hit max power. Also, all artifacts are placed at the start, so you can do
the bases in whatever order you want.
2012-12-13 22:54:13 +01:00
automerge
5d7a773917
Merge branch 'bugfixes'
2012-12-10 08:00:33 +01:00
Per Inge Mathisen
0d3d8aedb7
Clean up mapmod loading code, removing one rather ugly global.
2012-12-08 14:07:15 +01:00
Per Inge Mathisen
1fd7036f25
Replace unix-style paths with platform-specific paths when adding
...
mapmod paths to search paths. This should fix ticket:3759. Patch
by crabster, modified by me.
2012-12-08 14:00:02 +01:00
Per Inge Mathisen
df917d6e67
qtscript: Move initialization and shutdown to stage two to avoid memory leakage.
...
Also make sure we clear out old labels.
2012-11-24 12:52:32 +01:00
Per Inge Mathisen
0b50b4bff4
qtscript: Fix label group loading so that it works no matter in what order
...
and source the various scripts are loaded from.
2012-11-24 12:20:16 +01:00
Per Inge Mathisen
11a112d8ba
Clean up template types and unused code
2012-08-04 17:33:51 +02:00
safety0ff
6382bbb08e
Fix dangling pointer when structures are destroyed and you are repositioning the delivery point.
...
Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.
Fixes #2041 .
2012-06-21 18:44:27 -04:00
vexed
2056093027
Don't convert to a platform specific string here, it causes bad things to happen.
...
"const char * PHYSFS_getRealDir ( const char * filename )
Figure out where in the search path a file resides.
The file is specified in platform-independent notation. "
2012-06-18 22:57:42 -04:00
Cyp
15c04ab10f
Handle different maps with identical names, instead of a desynch.
...
Fixes ticket:3531 and ticket:3180.
2012-06-19 01:50:07 +02:00
Cyp
96272ebf50
Use OpenGL functions under extension names, if not present under regular names.
2012-06-16 23:25:49 +02:00
Cyp
68639f734f
Synchronise enabling of debug mode.
2012-02-13 00:45:37 +01:00