Commit Graph

359 Commits

Author SHA1 Message Date
SoftCoder 75aaed1b3d - changed win64 build to use streflop by default 2015-11-04 17:36:22 -08:00
SoftCoder b83fab237b - speed up msvc compile 2015-10-28 22:43:38 -07:00
SoftCoder 8aa7928567 - correct msvc intermediate folders for some projects to avoid compile collisions 2015-10-28 22:34:30 -07:00
SoftCoder 584b991f5c - few updates to the msvc 2015 build scripts to fix some issues 2015-10-26 16:37:57 -07:00
SoftCoder 18020e3f90 - added support for xp compatible 32 bit windows builds 2015-10-26 15:45:38 -07:00
SoftCoder 719029358f - msvc 2015 build script works 2015-10-24 23:48:40 -07:00
SoftCoder 81346ba6b9 - updated msvc 2015 build script to point to new dependency url 2015-10-24 22:41:10 -07:00
SoftCoder 86912ce2a6 - added support for vc 2015 2015-10-24 22:02:49 -07:00
SoftCoder fb0ac449be - more windows updates for compiling sdl2 2015-10-17 21:09:53 -07:00
SoftCoder 92aa2a7e04 - updated windows build for sdl2 2015-10-17 17:58:25 -07:00
Tom Reynolds 0510e338c1 Auxiliary files have moved to GitHib 2015-06-08 02:59:37 +02:00
filux 397be04584 Merge pull request #10 from filux/develop
Masterserver's code in the separate repository 2/2.
almost year since pr :)
2015-03-19 20:56:40 +01:00
filux 5046d4c4a7 improved scripts 2015-03-16 21:07:36 +01:00
filux b50efbb75e updated version number for development 2015-03-09 01:05:24 +01:00
filux 90c307182e updated version number for release 2015-03-09 00:34:59 +01:00
filux 2eb3f7f6d3 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-27 21:02:51 +01:00
titiger adb71b4add get rid of AccessControl.dll in repository
this is now downloaded on demand.
2015-02-02 00:17:05 +01:00
filux 509266e9a9 Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	source/masterserver/flags/ad.png
	source/masterserver/flags/af.png
	source/masterserver/flags/ag.png
	source/masterserver/flags/ai.png
	source/masterserver/flags/al.png
	source/masterserver/flags/am.png
	source/masterserver/flags/ar.png
	source/masterserver/flags/as.png
	source/masterserver/flags/at.png
	source/masterserver/flags/au.png
	source/masterserver/flags/aw.png
	source/masterserver/flags/ax.png
	source/masterserver/flags/az.png
	source/masterserver/flags/ba.png
	source/masterserver/flags/bb.png
	source/masterserver/flags/bd.png
	source/masterserver/flags/be.png
	source/masterserver/flags/bf.png
	source/masterserver/flags/bg.png
	source/masterserver/flags/bi.png
	source/masterserver/flags/bj.png
	source/masterserver/flags/bm.png
	source/masterserver/flags/bn.png
	source/masterserver/flags/bo.png
	source/masterserver/flags/br.png
	source/masterserver/flags/bs.png
	source/masterserver/flags/bt.png
	source/masterserver/flags/bv.png
	source/masterserver/flags/bw.png
	source/masterserver/flags/by.png
	source/masterserver/flags/bz.png
	source/masterserver/flags/ca.png
	source/masterserver/flags/cc.png
	source/masterserver/flags/cf.png
	source/masterserver/flags/cg.png
	source/masterserver/flags/ci.png
	source/masterserver/flags/ck.png
	source/masterserver/flags/cl.png
	source/masterserver/flags/cm.png
	source/masterserver/flags/cn.png
	source/masterserver/flags/co.png
	source/masterserver/flags/cr.png
	source/masterserver/flags/cs.png
	source/masterserver/flags/cu.png
	source/masterserver/flags/cv.png
	source/masterserver/flags/cx.png
	source/masterserver/flags/cz.png
	source/masterserver/flags/de.png
	source/masterserver/flags/dj.png
	source/masterserver/flags/dk.png
	source/masterserver/flags/dm.png
	source/masterserver/flags/do.png
	source/masterserver/flags/dz.png
	source/masterserver/flags/ec.png
	source/masterserver/flags/eg.png
	source/masterserver/flags/eh.png
	source/masterserver/flags/er.png
	source/masterserver/flags/es.png
	source/masterserver/flags/et.png
	source/masterserver/flags/fi.png
	source/masterserver/flags/fj.png
	source/masterserver/flags/fk.png
	source/masterserver/flags/fm.png
	source/masterserver/flags/fr.png
	source/masterserver/flags/ga.png
	source/masterserver/flags/gb.png
	source/masterserver/flags/gd.png
	source/masterserver/flags/ge.png
	source/masterserver/flags/gf.png
	source/masterserver/flags/gh.png
	source/masterserver/flags/gl.png
	source/masterserver/flags/gm.png
	source/masterserver/flags/gn.png
	source/masterserver/flags/gp.png
	source/masterserver/flags/gq.png
	source/masterserver/flags/gr.png
	source/masterserver/flags/gs.png
	source/masterserver/flags/gt.png
	source/masterserver/flags/gu.png
	source/masterserver/flags/gw.png
	source/masterserver/flags/gy.png
	source/masterserver/flags/hk.png
	source/masterserver/flags/hm.png
	source/masterserver/flags/hn.png
	source/masterserver/flags/hr.png
	source/masterserver/flags/ht.png
	source/masterserver/flags/hu.png
	source/masterserver/flags/ie.png
	source/masterserver/flags/in.png
	source/masterserver/flags/io.png
	source/masterserver/flags/iq.png
	source/masterserver/flags/ir.png
	source/masterserver/flags/is.png
	source/masterserver/flags/jm.png
	source/masterserver/flags/jo.png
	source/masterserver/flags/ke.png
	source/masterserver/flags/kg.png
	source/masterserver/flags/kh.png
	source/masterserver/flags/ki.png
	source/masterserver/flags/km.png
	source/masterserver/flags/kn.png
	source/masterserver/flags/kp.png
	source/masterserver/flags/kr.png
	source/masterserver/flags/kw.png
	source/masterserver/flags/ky.png
	source/masterserver/flags/kz.png
	source/masterserver/flags/la.png
	source/masterserver/flags/lb.png
	source/masterserver/flags/lc.png
	source/masterserver/flags/li.png
	source/masterserver/flags/lk.png
	source/masterserver/flags/ls.png
	source/masterserver/flags/lt.png
	source/masterserver/flags/lu.png
	source/masterserver/flags/lv.png
	source/masterserver/flags/ly.png
	source/masterserver/flags/ma.png
	source/masterserver/flags/md.png
	source/masterserver/flags/me.png
	source/masterserver/flags/mg.png
	source/masterserver/flags/mh.png
	source/masterserver/flags/mk.png
	source/masterserver/flags/ml.png
	source/masterserver/flags/mm.png
	source/masterserver/flags/mn.png
	source/masterserver/flags/mo.png
	source/masterserver/flags/mp.png
	source/masterserver/flags/mq.png
	source/masterserver/flags/mr.png
	source/masterserver/flags/ms.png
	source/masterserver/flags/mu.png
	source/masterserver/flags/mv.png
	source/masterserver/flags/mw.png
	source/masterserver/flags/mx.png
	source/masterserver/flags/my.png
	source/masterserver/flags/mz.png
	source/masterserver/flags/na.png
	source/masterserver/flags/nc.png
	source/masterserver/flags/ne.png
	source/masterserver/flags/nf.png
	source/masterserver/flags/ng.png
	source/masterserver/flags/ni.png
	source/masterserver/flags/nl.png
	source/masterserver/flags/no.png
	source/masterserver/flags/np.png
	source/masterserver/flags/nr.png
	source/masterserver/flags/nu.png
	source/masterserver/flags/nz.png
	source/masterserver/flags/om.png
	source/masterserver/flags/pa.png
	source/masterserver/flags/pf.png
	source/masterserver/flags/pg.png
	source/masterserver/flags/ph.png
	source/masterserver/flags/pk.png
	source/masterserver/flags/pm.png
	source/masterserver/flags/pn.png
	source/masterserver/flags/pr.png
	source/masterserver/flags/pt.png
	source/masterserver/flags/pw.png
	source/masterserver/flags/py.png
	source/masterserver/flags/re.png
	source/masterserver/flags/ro.png
	source/masterserver/flags/rs.png
	source/masterserver/flags/ru.png
	source/masterserver/flags/rw.png
	source/masterserver/flags/sa.png
	source/masterserver/flags/sb.png
	source/masterserver/flags/sc.png
	source/masterserver/flags/sd.png
	source/masterserver/flags/se.png
	source/masterserver/flags/sg.png
	source/masterserver/flags/sh.png
	source/masterserver/flags/si.png
	source/masterserver/flags/sj.png
	source/masterserver/flags/sk.png
	source/masterserver/flags/sl.png
	source/masterserver/flags/sm.png
	source/masterserver/flags/sn.png
	source/masterserver/flags/so.png
	source/masterserver/flags/sr.png
	source/masterserver/flags/st.png
	source/masterserver/flags/sv.png
	source/masterserver/flags/sz.png
	source/masterserver/flags/tc.png
	source/masterserver/flags/td.png
	source/masterserver/flags/tf.png
	source/masterserver/flags/tg.png
	source/masterserver/flags/th.png
	source/masterserver/flags/tk.png
	source/masterserver/flags/tl.png
	source/masterserver/flags/tm.png
	source/masterserver/flags/tn.png
	source/masterserver/flags/tr.png
	source/masterserver/flags/tt.png
	source/masterserver/flags/tv.png
	source/masterserver/flags/tw.png
	source/masterserver/flags/tz.png
	source/masterserver/flags/ua.png
	source/masterserver/flags/ug.png
	source/masterserver/flags/um.png
	source/masterserver/flags/us.png
	source/masterserver/flags/uy.png
	source/masterserver/flags/uz.png
	source/masterserver/flags/va.png
	source/masterserver/flags/vc.png
	source/masterserver/flags/ve.png
	source/masterserver/flags/vg.png
	source/masterserver/flags/vi.png
	source/masterserver/flags/vn.png
	source/masterserver/flags/vu.png
	source/masterserver/flags/wf.png
	source/masterserver/flags/ws.png
	source/masterserver/flags/ye.png
	source/masterserver/flags/yt.png
	source/masterserver/flags/za.png
	source/masterserver/flags/zm.png
	source/masterserver/flags/zw.png
	source/masterserver/images/game_icon.png
2015-01-23 21:52:03 +01:00
titiger ae5668ab52 version set to 3.12-dev 2015-01-23 21:18:57 +01:00
titiger 30a8667307 version set to 3.11.0 2015-01-20 23:10:36 +01:00
titiger 7a34b3ea20 linux script to build windows installer 2015-01-20 00:51:31 +01:00
titiger 1a9c48fd3c windows installer without ebanner
ebanner has unclear license and you always had to install it. 
The AccessControl pugin is now added, so it gets much more easy to
create windows installers on linux.
2015-01-20 00:24:07 +01:00
Tom Reynolds d3d0fbf9bf lossless images compression
keeping file formats, comments + EXIV meta data intact
2015-01-14 23:58:30 +01:00
SoftCoder 172dfe3411 - update a few scripts to exclude cegui data 2014-12-29 17:23:20 -08:00
SoftCoder 7f0b199929 - disable use of streflop in x64 windows build 2014-12-22 16:30:49 -08:00
SoftCoder 645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
filux 9988ea9cbf resolved conflicts to upstream/develop 2014-09-27 11:19:29 +00:00
titiger b72f4857d7 multi projectiles with different timings and particle systems 2014-07-18 01:04:36 +02:00
filux 4a3875c114 All paths to flags probably are fixed now. & Removed 2 old scripts related with svn. 2014-03-27 20:26:01 +01:00
Tom Reynolds fa0a8ac9e7 No prompt for file removal 2014-03-16 06:16:24 +01:00
Tom Reynolds cf53540438 Windows: delete Release\*.tlog before building 2014-03-16 06:13:31 +01:00
SoftCoder 3c6bac9435 - removed unused compiler setting from vc++ 2012 projects 2014-02-07 15:48:44 -08:00
SoftCoder 63863bac89 - updated unit test to compile on windows
- updated vc++ 2012 compile flags and changed asm to use unsigned
2014-02-07 15:42:00 -08:00
SoftCoder e42b802b81 - fixed make binary script for win64 2014-02-04 14:53:56 -08:00
SoftCoder bf5001a49a - fixed windows build with bad paths 2014-02-01 10:57:56 -08:00
SoftCoder 2b59eda69b - added new unit test to msvc builds 2014-02-01 10:31:58 -08:00
SoftCoder 78ed6d4601 - attempt to add streflop to win64 build
- CRAZY attempt to add x64 (win64) support to streflop via some new asm code!
2014-02-01 01:28:30 -08:00
SoftCoder 6542ae5110 - re-enabled streflop as it is keeping us stable 2014-01-31 18:05:49 -08:00
Tom Reynolds 7dd40cd1be more git ignores for Windows 2014-01-30 23:43:26 +01:00
SoftCoder 338f156a95 - changing version to v3.10.0-dev for new development 2014-01-27 11:21:22 -08:00
filux aa5403d8ef Merge remote branch 'upstream/master'.
Conflicts:
	mk/linux/.gitignore
	mk/windoze/coverity-scan.bat
2014-01-27 08:23:42 +01:00
SoftCoder d8c9ffa922 - updated vc++ 2012 build script to point to correct dep file 2014-01-26 22:09:59 -08:00
Tom Reynolds 57397b3f28 Update .gitignore's 2014-01-27 06:42:10 +01:00
Tom Reynolds f284bea230 update paths for coverity-scan.bat 2014-01-27 05:41:30 +01:00
filux 8ec938a940 Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat 2014-01-26 09:46:53 +01:00
SoftCoder dd0e527412 - removed including streflop in windows builds 2014-01-25 19:55:01 -08:00
Tom Reynolds 4c64df640b .coverity-submit is now .coverity-scan for windows, too 2014-01-26 04:19:07 +01:00
SoftCoder 952004151c - removed d3d files which were deprecated long ago
- removed freetype-gl (the embedded library from code.google.com)
2014-01-25 17:54:46 -08:00
filux ea7b088919 Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files. 2014-01-25 21:52:02 +01:00
filux 3b8e350b4b The documentation's files format will be more friendly for the average Windows OS user. 2014-01-25 20:29:49 +01:00