d69e19b87b
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
...
Conflicts:
source/shared_lib/include/platform/sdl/factory_repository.h
2013-12-14 02:45:25 -08:00
65e55d3796
- merged changes with windows build fixes
...
- updated svn commands to git for validation params
2013-12-14 02:44:41 -08:00
1d9f1f9432
- forgot to commit changes
2013-12-14 02:33:03 -08:00
ec13e904d3
- fixed windows build (removed gl2 references)
2013-12-14 02:29:32 -08:00
209458adee
- removed deprecated gl2 code as it was not used
2013-12-14 02:22:30 -08:00
b9d6b38e8f
- coverity based bug fixes - round #1
2013-12-13 23:04:12 -08:00
c887b0c357
- attempt to cleanup a few warnings
...
- attempt to get git rev info each compile (not just when running cmake)
2013-12-11 23:16:56 -08:00
c91b92901b
- added ignore folder
2013-12-11 19:18:33 -08:00
a567fe159d
- bugfix for headless mode segfault reported by titi
2013-12-11 19:07:24 -08:00
257b794e46
Travis CI: IRC bot should use CTCP notify in favor of plain messages
2013-12-11 17:23:24 +01:00
ae8f00d7a3
- added more paths to ignore
2013-12-09 23:05:07 -08:00
19a7e3a82e
- updated passing core count to travis ci build
2013-12-09 18:21:29 -08:00
ad81692331
Merge branch 'master' of https://github.com/williame/megaglest-source
2013-12-09 18:07:42 -08:00
3bc5901a01
From Bugreport: cannot delete characters after clicking on player name in lobby
...
https://forum.megaglest.org/index.php?topic=9302.0
2013-12-10 01:52:08 +01:00
dcada00514
as there are already several changes to originla 3.9.0 we better set a new version number
2013-12-09 23:14:33 +01:00
d75aefc35e
.gitignore: make some ignore rules more specific to rule out side effects
...
.travis.yml: now that gcc is fixed, build on clang, too
LICENSE.md: there is no need for this symlink since the license file is not displayed on github anyways
README.md: This file is not in MD format, so renamed symlink to .TXT
build-mg.sh: improve configurability, script structure (will externalize distro/arch detection next)
2013-12-09 22:26:16 +01:00
941257c247
- attempt to see if this fixes the travis compile problem
2013-12-08 21:26:41 -08:00
cebf6a8184
- added cores count to build script and added ability to force to 1 core
2013-12-08 21:22:35 -08:00
3bb4f7ab40
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2013-12-08 20:09:47 -08:00
e718f78931
- corrected compile warnings for unit test
2013-12-08 20:08:44 -08:00
21bda9f691
testing travis changes
2013-12-09 01:56:11 +01:00
78eb119c29
get build system info for travis CI
2013-12-09 01:15:06 +01:00
09fb20182a
- Enable clang builds for Travis CI
...
- build-mg.sh: Switch to clang build if CC and CXX env vars both contain 'clang'
2013-12-08 23:00:25 +01:00
2a3ff97813
YML is not XML
2013-12-08 22:12:33 +01:00
a6ae9ec79b
- mk/linux/setupBuildDeps.sh:
...
- add option for silent installs (APT only for now)
- remove autotools, subversion dependency
- add check for availability of 'git' command
- replace svnversion by git commit output
- add .travis.xml as per http://about.travis-ci.org/docs/user/languages/cpp/
- make git ignore megaglest man page as generated by Linux builds
2013-12-08 22:03:34 +01:00
2d6da27807
Merge branch 'master' of github.com:MegaGlest/megaglest-source
2013-12-07 20:41:44 +01:00
822f7884f2
update ignore list
2013-12-06 12:09:51 -08:00
02d41bd5f7
fixed windows build
2013-12-06 09:08:47 -08:00
25dfdb7e08
- added missing file
2013-12-05 23:35:24 -08:00
16c857d1b0
- added missing file
2013-12-05 23:21:05 -08:00
62a1dab85a
tweak to build with kdevelop on osx
2013-12-05 23:48:12 +01:00
46a0dab916
moved model constructor always behind factory
2013-12-05 21:28:20 +01:00
6afadafa1e
Start to abstract model
2013-12-05 16:17:41 +01:00
bf1c7df8bb
merged upstream
2013-12-04 23:57:24 +01:00
6ae1d179bb
- updated for proper build on Mac
2013-12-04 14:54:02 -08:00
03c0197437
merge from upstream
2013-12-04 23:37:04 +01:00
e71e7104dc
Trying to build on OSX
2013-12-04 22:38:06 +01:00
f9e217df94
- bugfix so Mac builds
2013-12-04 13:34:00 -08:00
7e4e98857b
integrate upstream
2013-12-04 08:49:33 +01:00
1e50f1cb93
- updated vc++ 2010 build file to use git
2013-12-02 12:59:36 -08:00
7d4bbeadfd
- added windows deps to ignore list
2013-12-02 09:48:23 -08:00
c97825d898
- updated windows x64 build to use git revision stamp
2013-12-02 09:45:46 -08:00
b868a8468b
- bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver.
2013-11-30 20:33:25 -08:00
4b50560ca9
- added color picking used colors count in debug view
2013-11-30 17:38:32 -08:00
f7bc5e8f92
- bugfix and additional code (for now) to track duplicates and problems in color picking. We now use will's implementation as it supports 64K colors.
2013-11-30 17:20:30 -08:00
a869dd0fee
Tweak to see if we can get the new colour picking code working
2013-12-01 00:43:49 +01:00
b36244fcbd
updated unit test to show max colors supported and when each algorithm fails.
2013-11-30 14:48:11 -08:00
c2929e3d2b
merged
2013-11-30 14:31:05 -08:00
2ff75c54e2
merged updates
2013-11-30 14:29:02 -08:00
0400312810
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2013-11-30 14:23:52 -08:00
SoftCoder