Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,177 Commits 1 Branch 0 Tags 27 MiB
09c686f82d
Commit Graph

885 Commits

Author SHA1 Message Date
filux
7451e49213 mapeditor and g3dviever will have always same version number as game, also game and binary packages will have always same version 2015-02-02 22:20:57 +01:00
filux
da33c43230 a bit more manual but also cleaner way of updating version number 2015-02-02 22:13:17 +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
5192c3f87f proposition of different version number management 2015-02-01 15:45:07 +01:00
filux
69e9dff754 better support for static build on debian 2015-01-31 11:53:59 +01:00
filux
5eeac92fb4 refreshed list of dependencies 2015-01-31 11:49:07 +01:00
filux
045f171b9a linux's binary without glest-dev.ini 2015-01-25 12:57:12 +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
49bde874fc linux installer tests 2015-01-20 00:51:57 +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
titiger
74e522b2f8 "v" was too much in the version string 2014-12-26 21:58:07 +01:00
titiger
11b766b5bc v3.11-beta2.0 2014-12-26 21:33:54 +01:00
SoftCoder
7f0b199929 - disable use of streflop in x64 windows build 2014-12-22 16:30:49 -08:00
Karl Goetz
70e10c610e Change Mac specific CMakeLists for CPack 
This commit includes several fixes and some shuffling of entries to improve
readability. The major changes are Removing MG_VERSION_H_CONTENTS which
*includes* the file with the version in it in favour of VER_* variables and
removing the CPack include at the end of the file.

CPack has to be included after all variables are set and this file is sourced
before all the common options are configured.

One more fixme is added - this and other runtime issues will have to be dealt
with when i test the packaging, so far I've only got it to build.
 2014-12-23 07:17:48 +11:00
Karl Goetz
1d591d4a8c Fix some erors in Info.plist 
This fixes a couple of issues, none too major:
- The MegaGlest executable is `megaglest` so that string was updated
- MG_VERSION_H_CONTENTS *includes* the file with the version in it (which I
  didn't realise when I changed it last time as I couldn't get things building
  still). This changes to using VER_* variables
- Update copyright to 2015 (I'm gambling on the project lasting another 2 weeks)
- Change CFBundleSignature to MGGL; a four letter contraction of MeGaGLest
 2014-12-23 07:17:34 +11:00
Mark Vejvoda
17a45c8da3 Merge pull request #40 from goetzk/remove-mac-specific-version-detection-code 
Remove mac specific version detection code
 2014-12-17 06:47:35 -08:00
Karl Goetz
ada9b55740 Revert change to quoting 
Accidentally included a change of quoting which isn't related to the diff at
hand; reverted with this commit.
 2014-12-17 20:28:20 +11:00
Karl Goetz
5b4b382d2c Remove unneeded comments 
These comments indicated TODO items and are no longer needed in the final change.
 2014-12-17 20:25:21 +11:00
Karl Goetz
0ce6fd3c5d Change library search path on MacOS 
When using mac ports GL/gl.h ends up outside the cmake search paths for
libraries and includes. By adding them to mk/macos/CMakeLists.txt they are now
available and make it possible to build g3d_viewer along with the rest of
megaglest. To make this work properly I had to move the inclusion of
mk/macos/CMakeLists.txt further up the master CMakeLists.txt so merged both IF
APPLE tests in to one.

This has built successfully through xcode and gnumake.
 2014-12-17 20:21:22 +11:00
Karl Goetz
4c10c9c2b3 Remove MEGAGLEST_VERSION for MG_VERSION_H_CONTENTS 
I noticed that mk/macos/CMakeLists.txt has special code for extracting the
megaglest version , but its already done in CMakeLists.txt. This removes the
duplicate detection and changes the users of MEGAGLEST_VERSION to
MG_VERSION_H_CONTENTS.
 2014-12-17 20:20:34 +11:00
titiger
58cba20cf4 update version in script 2014-12-03 01:30:03 +01:00
SoftCoder
829f23db4e - updated deps for ubuntu 14.04 and higher 2014-11-29 22:45:31 -08:00
SoftCoder
645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
Tom Reynolds
86ce576a45 include more info in coverity build "description" 2014-11-10 09:39:19 +01:00
titiger
9f633ada18 key settings to toggle HP bars 2014-11-07 02:00:36 +01:00
titiger
250294bc9e fix for librtmp.so.0 missing 
https://forum.megaglest.org/index.php?topic=9578.0
 2014-11-02 22:26:38 +01:00
filux
1724fddb65 Merge remote-tracking branch 'upstream/develop' into develop 2014-10-16 21:16:49 +00:00
titiger
6267756646 trying to fix the ubuntu libtasn1.so.3 problem 2014-10-02 00:42:45 +02:00
filux
9988ea9cbf resolved conflicts to upstream/develop 2014-09-27 11:19:29 +00:00
Tom Reynolds
30d362652d And another... 2014-09-25 02:22:57 +02:00
Tom Reynolds
2738169c6b Another try... 2014-09-25 02:09:16 +02:00
Tom Reynolds
9ae185e37b add shared ini's when packaging bin's 2014-09-25 00:48:39 +02:00
Tom Reynolds
7c73b47a13 buildDeps: Fix openSUSE + add current Ubuntu/Mint 2014-07-24 22:14:36 +02:00
Tom Reynolds
a4c7652db5 SuSE is now OpenSuse is now openSUSE 2014-07-24 21:59:15 +02:00
titiger
49fc7d4bce Suse 13.x is supported too now 2014-07-23 23:24:47 +02: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
filux
fdd5eb52fe Removed masterserver's code (separation from the source). 2014-03-27 20:12:04 +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
Tom Reynolds
d348edc634 build-mg.sh: no more warning when clang is not installed [ci skip] 2014-02-15 02:38:42 +01:00
Tom Reynolds
cc64e6cc8e fix detection for CXX=clang 2014-02-12 00:55:29 +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
b1cafabb01 - added cmake compile warning when users uses clang as clang currently does NOT support some critical GCC settings we require. 2014-02-06 19:14:14 -08:00
SoftCoder
e42b802b81 - fixed make binary script for win64 2014-02-04 14:53:56 -08:00
Tom Reynolds
497ea1734e Update server list 2014-02-02 22:35:50 +01: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
e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08: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
d97ad0015c replace remaining references to .coverity-submit by .coverity-scan 2014-01-27 06:13:14 +01:00
Tom Reynolds
f284bea230 update paths for coverity-scan.bat 2014-01-27 05:41:30 +01:00
SoftCoder
0a245e76d2 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-26 08:09:15 -08: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
42dae7cda6 - updated git ignore 2014-01-25 21:27:39 -08: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
a1adfb6b66 Another one converted file LF -> CRLF. 2014-01-25 22:16:20 +01: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
Tom Reynolds
d95a47807e Make the coverity-scan script use a configuration file name which is closer to its own name 2014-01-25 13:55:56 +01:00
SoftCoder
ea6d208947 - fix linux scripts 2014-01-24 18:32:42 -08:00
SoftCoder
c64693898f - removed uneeded softlinks 2014-01-24 17:56:02 -08:00
SoftCoder
fe808556bd - added more fields for dev path support.. onlu ico files for linxu left to fix 2014-01-24 17:51:06 -08:00
SoftCoder
86c6c6ee17 Merge branch 'master' of https://github.com/MegaGlest/megaglest-source 2014-01-24 16:51:53 -08:00
SoftCoder
2a3ae90e61 - updated win64 projects and scripts 2014-01-24 16:50:57 -08:00
SoftCoder
816816567f - updated paths for windows installer 2014-01-24 16:33:34 -08:00
SoftCoder
988743d867 - moved all binary content for windows to mk/windoze 2014-01-24 16:05:28 -08:00
SoftCoder
581a975209 - added support for dev mode paths and removed linux symlinks for game data 
- bugfix for segfault on headless when client disconnects
 2014-01-24 13:44:21 -08:00
SoftCoder
1cacb0df27 - missed some updates 2014-01-24 09:50:17 -08:00
SoftCoder
b6a956d395 - moved duplicate files in mk/shared and adjusted various scripts and references 2014-01-24 09:44:18 -08:00
Tom Reynolds
f0b1537e0b Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source 2014-01-22 19:19:05 +01:00
Tom Reynolds
87aa45ef81 - Fix CC / CXX environment variable detection n build-mg.sh 
- gitignore build-mg.sh's build/ at the new location
 2014-01-22 19:17:01 +01:00
SoftCoder
0ddc384f08 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-22 10:08:21 -08:00
SoftCoder
c5e40aade4 - somehow this files was missed 2014-01-22 10:07:24 -08:00
SoftCoder
6e2388b5d1 - fix the build on windows (getting stupid msbuild errors related to mt.exe so applied work around) 2014-01-22 07:44:27 -08:00
SoftCoder
1bd772a4f3 - updated linux and windows installer scripts with new paths 2014-01-21 23:40:53 -08:00
SoftCoder
92daccf963 - cleanup of cmake scripts and proper organizing of files 2014-01-21 23:21:56 -08:00
SoftCoder
11ac54a705 - bugfix for linux data archive script and git repo 2014-01-18 16:59:46 -08:00
SoftCoder
318c700b8f - more accurate pull of latest code from git 2014-01-18 12:15:00 -08:00
SoftCoder
2e5d6f8814 - increase linux installer expanded byte size 2014-01-18 00:54:34 -08:00
SoftCoder
ef82c52495 - update windows data archive script to use git 2014-01-17 23:45:44 -08:00
SoftCoder
daf96d2af6 - added tar.exe to windows build process since it may be used for some build script in connection with git 2014-01-17 20:46:46 -08:00
SoftCoder
4bada8fc5a - updating game version to 3.9.1 in preparation for release 2014-01-17 19:37:25 -08:00
SoftCoder
d6e7deb26e - bugfix for linux installer build script finding vlc folder 2014-01-17 19:23:33 -08:00
SoftCoder
a690867bcd - small update to release data source build script (different assumed path) 2014-01-17 18:57:18 -08:00
SoftCoder
0078909bc1 - added shortcut to megaglest menu folder to point to installation folder 2014-01-17 18:10:58 -08:00