732e5a1927
Remove unsued and unmaintained betawidget library from Source tree.
...
This should be moved to a experimental branch until something comes out of it.
2013-01-16 16:15:53 -05:00
d873d313ad
Remove EditWorld from source tree.
...
This only worked on windows, used DX (5/6), and MFC, and will not compile 'as is'.
Even if you could get it to compile, the data it produces will not work with the
current Warzone builds.
For a map editor, it is highly suggested you use FLaME. https://github.com/Warzone2100/flaME
2013-01-16 16:11:48 -05:00
6c6fe7c38a
Merge branch 'bugfixes'
...
Conflicts:
src/e3demo.cpp
src/e3demo.h
2013-01-16 15:44:22 -05:00
e34e7e4e0c
Seems time don't stop, so bump the year to 2013.
2013-01-16 15:34:57 -05:00
be44aaf842
qtscript: Add new function propulsionCanReach(propulsion, x1, y1, x2, y2).
...
Patch by NoQ, with help text change suggested by aubergine.
2013-01-16 17:53:00 +01:00
958993e609
qtscript: addDroid() and addStructure() now return the created game objects on success.
...
Added new global isMultiplayer which is true iff the current game is a online game.
2013-01-16 17:49:48 +01:00
d1627c4247
Do not investigate model vertices when determining defense foundation depth and placement.
2013-01-15 22:50:30 +01:00
1c58071405
Remove zoom limits in debug mode.
2013-01-15 22:36:51 +01:00
7d5179573d
Clean up addConstructionLine and allow construction and demolish beam colours be moddable.
2013-01-15 22:24:51 +01:00
1566232f99
Clean up upgrade function code.
2013-01-15 19:01:00 +01:00
7437d6662c
qtscript: Add removeLabel(label) function. Fix documentation for addLabel().
2013-01-15 18:18:55 +01:00
931f4b6b5c
Make sure the right sequences.wz gets copied.
2013-01-14 23:29:18 -05:00
a91a9fc4e5
Remove --disable-sound and associated #defines to clean up clutter in audio code. This closes ticket:3871.
2013-01-14 19:29:35 +01:00
c669f7f860
Make sequence video rendering use VBOs instead of immediate mode.
2013-01-14 19:28:04 +01:00
ccc2a07bd3
Merge branch 'bugfixes'
2013-01-14 08:00:56 +01:00
2b31f828a6
Fix the mac builds broken by aa40e70b44.
2013-01-13 23:36:50 -05:00
c855c90c81
Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.
2013-01-13 10:31:49 -05:00
06e4590128
Render models using vertex buffer objects instead of vertex arrays. Patch reviewed by Cyp.
2013-01-13 11:35:27 +01:00
7d928f109c
Remove another "shadow".
2013-01-13 00:22:44 +01:00
cb2b66f3a8
Remove shadow parts from a few models.
2013-01-12 22:02:31 +01:00
a37a9ea5a2
qwzm: Build fix
2013-01-12 20:19:02 +01:00
aa40e70b44
Use indexed vertex array drawing. This reduces the effective number of vertices in a model by 20-40%.
2013-01-12 20:19:02 +01:00
4aa873b3aa
Make smooth water bed generation, instead of random jitter. Patch by NoQ.
2013-01-12 15:57:06 +01:00
0d91966f54
Change locate mouse in 3D function to not rely on static global. Finally remove tileScreenInfo.
2013-01-12 00:28:38 +01:00
78ec72052a
Remove useless flattening of delivery points to terrain. (As a
...
side-effect of this, the vertex limit for models has been removed.)
2013-01-11 21:49:05 +01:00
673abb734a
Various small fixes -- from Safety0ff/gfrcyp
2013-01-11 21:31:27 +01:00
ff71152d89
Remove unused variable and unused include -- from Safety0ff/gfrcyp
2013-01-11 21:09:21 +01:00
d478131f12
Remove useless imdRot variables for display3d.cpp -- from Safety0ff/gfrcyp
2013-01-11 21:06:38 +01:00
d24719344d
Merge branch 'bugfixes'
2013-01-11 08:08:21 +01:00
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
781a81c94b
Fix GUI bug where scav button pretends to be clickable even when not the host.
2013-01-10 10:06:36 +01:00
8d5b07485f
Render models as client side vertex arrays instead of using immediate mode OpenGL calls. Patch reviewed by Cyp.
2013-01-09 23:33:19 +01:00
e333e49f19
Merge branch 'master' of github.com:Warzone2100/warzone2100
2013-01-09 21:00:31 +01:00
8bf8a27298
Remove remains of non-triangle polygon support in model renderer. Simplify renderer.
2013-01-09 21:00:10 +01:00
b9a771548b
Remove some unused drawing code.
2013-01-09 20:37:18 +01:00
552f894c2f
Replace 72 out of 130 calls to iV_Line() graphics primitive with fewer, higher level calls.
2013-01-09 20:04:41 +01:00
dd8ed6d932
cleanup: Remove some unused defines.
2013-01-09 12:56:12 +01:00
40cbe8067b
cleanup: Remove some unused defines.
2013-01-09 12:53:03 +01:00
37aef13bfd
Remove unnecessary steps and duplicate code in droid build code. Also add
...
future proofing for droid actions in savegames.
2013-01-07 18:20:36 +01:00
f5c1543581
Improve logging and clarify source code in regards to cancelling build orders. May fix ticket:3862.
2013-01-07 18:00:33 +01:00
1f3cc737c9
Fix warning. This closes ticket:3861 and ticket:3860.
2013-01-07 17:20:44 +01:00
1193559f53
Merge branch 'bugfixes'
...
* bugfixes:
Make configure fail if it doesn't find flex.
Update the default layout for CS-ID.xcconfig.
Emit warnings on improperly / unsigned frameworks.
Do not rely on the default Designated Requirements.
stats: Prevent double-counting of wins/losses.
stats: Use actual number of games played when drawing medals.
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Prevent updating autorevision.h's timestamp when its contents haven't changed
Prevent out-of-bounds array access
map2preview: handle unknown tilesets
Conflicts:
src/multiint.cpp
2013-01-07 15:27:58 +01:00
053a19c350
Fix the mac build broken by e48052ee83.
2013-01-06 20:48:21 -05:00
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
20cefacef6
Make configure fail if it doesn't find flex.
...
Fixes #3859 .
2013-01-06 21:51:39 +01:00
59adc3c5e8
Refactor sequence display code to prepare for OpenGL ES2 porting.
2013-01-06 13:30:02 +01:00
f6f9c46441
Fix typo in rules.js, noticed by NoQ. Closes ticket:3857
2013-01-06 12:00:57 +01:00
c6e66959c9
Update the default layout for CS-ID.xcconfig.
2013-01-05 21:14:27 -05:00
767c19e1b6
Emit warnings on improperly / unsigned frameworks.
2013-01-05 20:36:21 -05:00
33ec6eee1a
Do not rely on the default Designated Requirements.
...
Also, sign the frameworks earlier.
2013-01-05 18:29:51 -05:00
vexed
per
dak180
automerge
cybersphinx
Subsentient
Cyp