Marc Zinnschlag
|
96fd9263bf
|
Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'
|
2016-08-09 10:17:26 +02:00 |
|
Aesylwinn
|
448c9d5a5b
|
Fix globals not being initialized with a valid type.
|
2016-08-09 00:17:41 -04:00 |
|
scrawl
|
0bbd715f65
|
Fix the cloned StateSet not being assigned
|
2016-08-09 01:13:19 +02:00 |
|
scrawl
|
5190275b37
|
Merge pull request #993 from mrcheko/pathfinding
Pathfinding unification
|
2016-08-09 00:41:03 +02:00 |
|
Aesylwinn
|
0963adb2f4
|
Fix pointer being deleted twice.
|
2016-08-08 14:36:50 -04:00 |
|
scrawl
|
46538b9438
|
Merge pull request #1011 from devnexen/master
Mainly making compilable under OpenBSD.
|
2016-08-07 20:34:03 +02:00 |
|
mrcheko
|
e2cd87fcc7
|
fix veritcal aiming
|
2016-08-07 19:23:08 +03:00 |
|
Marc Zinnschlag
|
aa1ed9b172
|
Merge remote-tracking branch 'aesylwinn/RenderWater'
|
2016-08-07 17:03:58 +02:00 |
|
scrawl
|
7b557af885
|
Merge pull request #1007 from MiroslavR/save-anim-state
Save scripted animation state
|
2016-08-06 20:39:32 +02:00 |
|
David Carlier
|
83bab29e4b
|
Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
|
2016-08-06 19:00:27 +01:00 |
|
Aesylwinn
|
16d0580ce8
|
Fix struct/class mismatch.
|
2016-08-05 15:39:08 -04:00 |
|
Aesylwinn
|
1f32f1eef5
|
Add water texture.
|
2016-08-05 14:55:40 -04:00 |
|
Aesylwinn
|
9454f4f2e7
|
Use shared water geometry + state generation,
Fix water position and render bin,
Fix passed cell parameter being ignored
|
2016-08-05 13:49:44 -04:00 |
|
Aesylwinn
|
5753f52b47
|
Move water mesh + simple state generation to components library.
|
2016-08-05 13:25:05 -04:00 |
|
Aesylwinn
|
3904a24e6c
|
Add missing include.
|
2016-08-05 00:30:28 -04:00 |
|
Aesylwinn
|
5674e0da24
|
Render water in editor.
|
2016-08-04 23:01:43 -04:00 |
|
LohikaarmeHAV
|
19c74a4d6e
|
Part two
|
2016-08-03 20:39:46 +03:00 |
|
LohikaarmeHAV
|
7309be8592
|
First part
|
2016-08-03 20:20:55 +03:00 |
|
lohikaarme
|
e8ef5c233f
|
Miss info
|
2016-08-03 14:24:21 +03:00 |
|
lohikaarme
|
0592d1cdcf
|
Commnent?
|
2016-08-03 14:22:25 +03:00 |
|
MiroslavR
|
b65f379b7f
|
Save scripted animation state (Fixes #1931, #2150, #3393)
|
2016-08-03 03:52:35 +02:00 |
|
lohikaarme
|
48bcde8cc9
|
...
|
2016-08-02 15:41:52 +03:00 |
|
LohikaarmeHav
|
b0cf276cfc
|
hups
|
2016-08-02 15:27:40 +03:00 |
|
LohikaarmeHav
|
7cd991107c
|
Nah
Preview seem to not like removing mCamPositionSet and I have do other things.
|
2016-08-02 15:26:12 +03:00 |
|
LohikaarmeHav
|
c6bc30d6a8
|
Forgot to remove line and add comment.
|
2016-08-02 14:27:19 +03:00 |
|
LohikaarmeHav
|
2e6f80688c
|
Removed debug
|
2016-08-02 14:10:08 +03:00 |
|
LohikaarmeHav
|
c6ec473280
|
Camera reset now every time cell object->view is pressed.
|
2016-08-02 13:46:43 +03:00 |
|
scrawl
|
3374630e7b
|
Merge pull request #1008 from Internecine/bug3451-invalid-enchantments
Fixes Bug 3451 - Invalid Enchantment IDs
|
2016-08-02 10:14:59 +02:00 |
|
Internecine
|
90735d226d
|
Replaced Store::find usage with Store::search to remove exception handlers.
|
2016-08-02 11:43:41 +12:00 |
|
Marc Zinnschlag
|
f32d0121fc
|
Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts'
|
2016-08-01 09:57:11 +02:00 |
|
Internecine
|
14165352f6
|
Added exception handlers when trying to retreive enchantment and magic effect data.
|
2016-08-01 13:16:42 +12:00 |
|
Aesylwinn
|
f73d60cc73
|
Make scene controls use configurable speed modifier.
|
2016-07-31 16:28:03 -04:00 |
|
Aesylwinn
|
bf2ab4ed45
|
Change the way modifiers are handled so they can be shared.
|
2016-07-31 16:07:17 -04:00 |
|
Aesylwinn
|
faea33b888
|
Revert "Change scene controls to more closely match blender as requested"
This reverts commit bc7ae70f0b .
|
2016-07-31 05:54:13 -04:00 |
|
Aesylwinn
|
bc7ae70f0b
|
Change scene controls to more closely match blender as requested
in the forums.
|
2016-07-30 09:53:45 -04:00 |
|
Aesylwinn
|
1cce085fa2
|
Remove unused headers.
|
2016-07-29 16:35:43 -04:00 |
|
Aesylwinn
|
2f97d6cffb
|
Move tool tip processing to ShortcutManager,
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
|
2016-07-29 16:02:46 -04:00 |
|
Aesylwinn
|
d7a83d80a2
|
Change some key binding defaults.
|
2016-07-29 15:00:58 -04:00 |
|
Aesylwinn
|
3475b83e90
|
Clean up modifier/shortcut class and handle focus out event,
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
|
2016-07-29 15:00:35 -04:00 |
|
Aesylwinn
|
96a3c278fd
|
Added shortcuts for loading a cell relative to the camera,
Removed Ctl+V binding for "Verify" because that is associated
with paste.
|
2016-07-27 21:40:53 -04:00 |
|
Aesylwinn
|
65201badf6
|
Add custom page for key bindings.
|
2016-07-27 19:15:24 -04:00 |
|
mrcheko
|
293a0f768c
|
use real distance to target to determinate 'ready to attack' state
|
2016-07-27 23:43:32 +03:00 |
|
LohikaarmeHav
|
f142f9bf86
|
wtf
|
2016-07-27 21:37:52 +03:00 |
|
Aesylwinn
|
b685c0ce6c
|
Add ability to clear shortcut/modifier setting with right click.
|
2016-07-27 14:07:53 -04:00 |
|
Aesylwinn
|
12db6d2114
|
Add modifier setting.
|
2016-07-27 13:53:33 -04:00 |
|
Marc Zinnschlag
|
63fd1e8df7
|
Merge remote-tracking branch 'origin/master'
|
2016-07-27 15:49:11 +02:00 |
|
Aesylwinn
|
b204758be1
|
More shortcuts.
|
2016-07-27 01:53:21 -04:00 |
|
Aesylwinn
|
3f7f75cc9d
|
Exclude keys not compatible with qt 4
|
2016-07-27 00:44:34 -04:00 |
|
Aesylwinn
|
3edc77a32b
|
Remove QShortcut usage,
Add a lot of shortcuts,
Remove debug messages
|
2016-07-27 00:24:16 -04:00 |
|
Aesylwinn
|
08af82e1bd
|
Switched to an interactive method for key input,
Redid text representation for shortcuts
|
2016-07-26 21:22:31 -04:00 |
|