Commit Graph

89 Commits (master)

Author SHA1 Message Date
per fc9a2a4edb Try to fix link errors on buildbot 2013-12-14 17:47:42 +01: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
per 468886b3d2 Maybe this will fix buildbot issues. 2013-12-08 10:58:15 +01:00
per 87e5e9074c Add unit test to prevent new dependencies from lib/framework to src/ from being added undetected. 2013-12-01 23:52:46 +01:00
per c4cdd4ae02 Fix model test reading of texture animation part of PIE files. Did not account for
possibility of floating point values, that are allowed.
2013-09-06 07:18:39 +02:00
dak180 898255a5e6 Update Qt to 4.8.4 for mac builds.
This commit ends support for 32 bit intel for mac builds.
2013-08-01 16:48:43 -04:00
dak180 6dc1eef3ff Fix the SDKROOT setting in sub projects.
Update xcode 4+ project files.
2013-08-01 16:48:28 -04:00
automerge 170f3a9931 Merge branch 'bugfixes' 2013-01-18 08:00:44 +01:00
Cyp c5d07a5407 Squelch warnings.
Fixes ticket:3880 and ticket:3882.
2013-01-17 15:28:33 +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
automerge 5d7a773917 Merge branch 'bugfixes' 2012-12-10 08:00:33 +01:00
Per Inge Mathisen ec12de4888 Remove qtscript test from 'make check' for now. Closes ticket:3500. 2012-12-08 16:33:49 +01:00
automerge 40b3e02ffc Merge branch 'bugfixes' 2012-11-03 00:42:03 +01:00
cybersphinx e8c7ff603a Fix the last two commits. 2012-10-28 17:09:33 +01:00
dak180 207248f977 Add a few forgotten files to the tarball. 2012-10-27 17:48:35 -04:00
Per Inge Mathisen 41738d947c Merge branch 'bugfixes'. Kept master fix for stored template filenames.
Conflicts:
	src/intdisplay.cpp
	src/multiint.cpp
	src/template.cpp
	tools/map/mapload.cpp
2012-10-27 00:19:18 +02:00
Cyp 20f3ad9a6e Fix some warnings in tests/.
Somehow, the previous code could compile and run correctly, without crashing.
2012-10-01 16:41:13 +02:00
automerge 7107400b2b Merge branch 'bugfixes' 2012-06-08 08:00:11 +02:00
dak180 64951d6f12 Try to only show issues in the test outputs. 2012-06-07 21:05:07 -04:00
dak180 75041d82ea Do not bother looking for things that might not exist. 2012-06-07 20:43:01 -04:00
dak180 c346e9ebb6 Add a mac build for the image helper program. 2012-06-05 15:35:19 -04:00
Per Inge Mathisen f875674270 Fix cppcheck warning. Closes ticket:3496 2012-06-03 00:05:12 +02:00
automerge dadfdf00f4 Merge branch 'bugfixes' 2012-05-21 08:00:09 +02:00
cybersphinx 52511cec60 Fix some typos.
Thanks to pabs for noticing one of them. Closes #3495.
2012-05-20 15:24:46 +02:00
automerge 1a03fc34f9 Merge branch 'bugfixes' 2012-04-23 06:00:09 +02:00
cybersphinx bfbe5bbb24 Update player number for lint.cpp and the map conversion tools. 2012-04-22 17:32:24 +02:00
Per Inge Mathisen 3daad92c94 wzscript: Readd global object documentation from qtscriptfuncs.cpp 2012-04-08 22:38:13 +02:00
Per Inge Mathisen 59206863f5 qtscript: Add .isHuman to complement .isAI. Also add .isAI to lint. 2012-03-31 21:24:56 +02:00
Per Inge Mathisen 0271c49365 qtscript: Add function setAssemblyPoint() 2012-03-31 21:00:55 +02:00
Per Inge Mathisen 9cec4cb144 qtscript: Add addFeature(x, y, name) function 2012-03-31 20:08:09 +02:00
Per Inge Mathisen deb1cd08ec qtscript: Add new function setAlliance(player1, player2, value). Also fix js lint. 2012-03-31 19:55:00 +02:00
Per Inge Mathisen fd94383fd2 Update to latest version of nullbot. Fix lint warning on labels. 2012-03-19 15:09:55 +01:00
cybersphinx d04b86ba24 Merge branch 'bugfixes' 2012-03-12 23:29:56 +01:00
dak180 ddd61cb6e3 Get rid of useless warnings, take 2. 2012-03-12 17:50:04 -04:00
cybersphinx 0f90835cf1 Merge branch 'bugfixes'
* bugfixes: (21 commits)
  Remove useless duplicate line.
  cleanup: Constify and match interpolatePos and interpolateAngle.
  Prevent division by zero in interpolateSpacetime().
  maint: Update mailing list address.
  dpkg: No more mods.
  Don't try to send limit data before hosting a game.
  cleanup: Put bHosted into multiint.h.
  linux: Make gdb backtrace all threads.
  Get rid of useless warnings, take 2.
  Add qslint to the Warzone app bundle.
  Fix and reorganize dependencies for the mac builds of the tests.
  Don't waste 200 ms before droids start moving.
  Muzzle flash fix for Assault Cannon & Cluster/HEAP Bomb projectile's texture fix and fix TCmask for Plasmite Flamer AA Flak Cannon Sunburst AA Rocket Array
  Add pie(state|types).h to the xcode project.
  Show milliseconds, if game speed is set to very slow.
  Fix dead pointer usage following lone droids dying during repair at repair facility.
  Allow Super+click as alternative to Meta+click or Alt+click.
  Don't assume we are still in demolish mode if not a droid type that can't do that. fixes ticket:2106
  Try not to allow multiple mouse presses when trying to kick people out of game. closes ticket:3209
  Don't display the demolish cursor over unbuilt structures. fixes ticket:3118
  ...
2012-03-10 13:40:44 +01:00
dak180 1ef7c6c3ce Get rid of useless warnings, take 2.
Xcode hates comments.
2012-03-09 17:29:54 -05:00
Per Inge Mathisen cdbe27557b Fix clang warning 2012-03-09 23:11:04 +01:00
dak180 d05472d811 Add qslint to the Warzone app bundle.
This should help mac modders test their scripts.

Also run the tests when making the dmgs.
2012-03-09 10:34:11 -05:00
dak180 484093744d Fix and reorganize dependencies for the mac builds of the tests.
Also eliminate a few useless warnings.
2012-03-09 09:58:28 -05:00
vexed 123e5a3a65 Merge branch 'bugfixes'
Conflicts:
	src/droiddef.h
	src/qtscriptfuncs.cpp
2012-02-27 21:46:51 -05:00
dak180 c91f51a3cf Add an xcode project to run the tests.
Also makes the qslint command line program.
2012-02-25 18:12:00 -05:00
vexed 151c082720 Merge branch 'bugfixes' 2012-02-20 19:45:39 -05:00
cybersphinx b5a45c02b0 Search data/mp for map files in addition to data/base.
Refs 779b4edcbd.
2012-02-20 00:26:43 +01:00
vexed c155e9fe80 Merge branch 'bugfixes'
Conflicts:
	data/mp/stats/body.txt
2012-02-19 17:28:17 -05:00
vexed cdb8c18d04 Try a alternative fix for 5694a6fded 2012-02-19 17:10:12 -05:00
Per Inge Mathisen de2aa9f9eb Try to fix buildbot 2012-02-19 22:59:48 +01:00
Per Inge Mathisen 86ef29ee30 Fix javascript lint program for isStructureAvailable() 2012-02-19 22:49:22 +01:00
Per Inge Mathisen 21288e825c Do not compile qslint for mingw32 (not sure why though). 2012-02-19 21:30:39 +01:00
Per Inge Mathisen d3f7497fbd qtscript: Test more events in unit tests 2012-02-18 23:04:26 +01:00