New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest stuff from sauerbraten #252

Merged
merged 13 commits into from Dec 18, 2015

Conversation

Projects
None yet
4 participants
@koraa
Copy link
Contributor

koraa commented Dec 12, 2015

No description provided.

@Croydon Croydon added this to the 0.5.0-alpha milestone Dec 12, 2015

@a-teammate

This comment has been minimized.

Copy link
Member

a-teammate commented Dec 13, 2015

dunno, actually this stuff looks pretty useless.. you set a var but you never use it O.o

hm i just checked, we skipped some stuff: we need to cherry pick since commit r5207. Our mirror seems to be broken here: comparing https://github.com/inexor-game/sauerbraten/commits/master with http://sourceforge.net/p/sauerbraten/code/commit_browser

@koraa koraa force-pushed the karo/sauer-updates branch 3 times, most recently from 6ecc431 to 672588e Dec 13, 2015

eihrul added some commits Aug 25, 2015

defformatstring fix
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5208 07af1644-1164-4067-b897-63bf4dc9b748
prefab previews
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5209 07af1644-1164-4067-b897-63bf4dc9b748
shiftai leavegame fix
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5210 07af1644-1164-4067-b897-63bf4dc9b748
ignore empty sendmaps
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5211 07af1644-1164-4067-b897-63bf4dc9b748
make some va externs global
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5216 07af1644-1164-4067-b897-63bf4dc9b748
worldscale fix
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5217 07af1644-1164-4067-b897-63bf4dc9b748
disable matgrid in wireframe
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5219 07af1644-1164-4067-b897-63bf4dc9b748
changedvars command
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5220 07af1644-1164-4067-b897-63bf4dc9b748
assert -> ASSERT
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5221 07af1644-1164-4067-b897-63bf4dc9b748
corner selection fix
git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5233 07af1644-1164-4067-b897-63bf4dc9b748

@koraa koraa force-pushed the karo/sauer-updates branch from 672588e to 12273a0 Dec 17, 2015

@koraa

This comment has been minimized.

Copy link
Contributor Author

koraa commented Dec 17, 2015

If CI succeeds, will be merged tomorrow around noon.

@koraa koraa merged commit 12273a0 into master Dec 18, 2015

4 checks passed

continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@Croydon

This comment has been minimized.

Copy link
Member

Croydon commented Dec 18, 2015

https://github.com/inexor-game/data/commits/sauer_merges still needs to get merged into master. I can't access Git right now unfortunately.

@koraa koraa deleted the karo/sauer-updates branch Dec 18, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment