Skip to content
Snippets Groups Projects
Commit 6bf8e3dc authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'development_stuff' into 'master'

Development improvements

An improvement to Objectplace I've wanted to make for a loooong time.

* Object number up/down is now assigned to ringslinger weapon next/prev. SO much nicer to use, especially since most people have that stuff bound to the scroll wheel.

Also, some changes to the devmode overlay:

* Plays nicely with showfps on - see http://imgur.com/a/zSzvm for the various cases (showfps on, devmode 65535, and both).
* Add PF_THOKKED to the flags in devmode DBG_DETAILED (as "TH").
* "Flags:" replaced with "PF:", "Heap used" replaced with "Heap". The latter is a debatable change, but the former isn't - otherwise the line is way too long compared to the rest of the stuff.

See merge request !45
parents fa187c5a e390598e
Branches
Tags
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment