Marc Zinnschlag
|
d1d861e1be
|
Merge branch 'run'
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
|
2014-09-14 11:59:54 +02:00 |
|
Marc Zinnschlag
|
bf6150d009
|
allow project scope scripts
|
2014-09-14 11:41:28 +02:00 |
|
Marc Zinnschlag
|
89000f6196
|
removed unused OmwLoader
|
2014-09-14 11:28:28 +02:00 |
|
Marc Zinnschlag
|
ea60c665dd
|
Merge remote-tracking branch 'ragora/bounditemflag'
|
2014-09-14 10:54:07 +02:00 |
|
Marc Zinnschlag
|
9b7f61b4ba
|
Merge remote-tracking branch 'scrawl/myguiplugin'
|
2014-09-14 10:45:26 +02:00 |
|
scrawl
|
bd96764229
|
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
|
2014-09-14 03:54:50 +02:00 |
|
Ragora
|
b8851790a6
|
Covered forgotten old bound item checks
|
2014-09-13 18:59:13 -04:00 |
|
Ragora
|
f250e3df4b
|
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
|
2014-09-13 18:48:41 -04:00 |
|
Marc Zinnschlag
|
081588f484
|
add project file to content file list when running OpenMW from OpenCS
|
2014-09-13 20:48:24 +02:00 |
|
Marc Zinnschlag
|
10fa205ced
|
fixed --data switch (was missing composing option)
|
2014-09-13 20:41:57 +02:00 |
|
Marc Zinnschlag
|
d4007ad89e
|
Merge remote-tracking branch 'mellotanica/master'
|
2014-09-13 18:56:15 +02:00 |
|
Marc Zinnschlag
|
1254198d90
|
add debug profiles to scene subviews view drag and drop
|
2014-09-13 18:54:29 +02:00 |
|
Marc Zinnschlag
|
3ed2edb7cb
|
rewrote run tool profile management
|
2014-09-13 18:53:35 +02:00 |
|
Marc Zinnschlag
|
882ef37ae3
|
Merge remote-tracking branch 'ragora/conjureditemsgmstcheck'
|
2014-09-13 15:58:02 +02:00 |
|
Marc Zinnschlag
|
94a7e38194
|
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
|
2014-09-13 15:55:06 +02:00 |
|
Marc Zinnschlag
|
690273d5b3
|
Merge remote-tracking branch 'ragora/fixmapresize'
|
2014-09-13 15:52:36 +02:00 |
|
scrawl
|
f82224497a
|
Compatibility fix for MyGUI git
|
2014-09-13 08:00:24 +02:00 |
|
scrawl
|
2c58a879ec
|
Fix minor exploit when map window is shown with transparency
|
2014-09-13 07:59:29 +02:00 |
|
scrawl
|
2b5adb325b
|
Remove a useless method
|
2014-09-13 07:57:15 +02:00 |
|
scrawl
|
cfc57d0fe0
|
Use MyGUI's castType for widget casts
|
2014-09-13 04:07:40 +02:00 |
|
Ragora
|
282e7abd16
|
Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is
|
2014-09-12 18:26:38 -04:00 |
|
Ragora
|
35571bb108
|
Global compass arrow rotates regardless of indoor or outdoor presence
|
2014-09-12 17:31:37 -04:00 |
|
Ragora
|
25f99c5d5a
|
Discarded use of a static variable and renamed event function to be less ambiguous
|
2014-09-12 15:06:37 -04:00 |
|
Marco Melletti
|
f212f0e4d2
|
subviews now get destroyed on close
|
2014-09-12 16:45:21 +02:00 |
|
Marc Zinnschlag
|
70ee899691
|
Merge remote-tracking branch 'cc9cii/Bug-No-1725'
Conflicts:
apps/opencs/model/tools/bodypartcheck.cpp
|
2014-09-12 14:37:26 +02:00 |
|
Marc Zinnschlag
|
b8fdccdbff
|
Merge remote-tracking branch 'cc9cii/Bug-No-1864'
|
2014-09-12 14:33:17 +02:00 |
|
Marc Zinnschlag
|
560eae3f4d
|
Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix'
|
2014-09-12 14:22:24 +02:00 |
|
Ragora
|
58d70c2895
|
Removed Unused includes from experimentation
|
2014-09-12 05:20:03 -04:00 |
|
Ragora
|
4ecac31752
|
Map keeps focus on wherever it was last moved when resizing map window
|
2014-09-12 05:16:33 -04:00 |
|
scrawl
|
c6bcd75058
|
Add various custom widgets used in OpenMW to the MyGUI plugin
|
2014-09-12 05:14:21 +02:00 |
|
Ragora
|
e105202ee2
|
Use std::set instead of std::map
|
2014-09-11 22:45:30 -04:00 |
|
scrawl
|
ee3b1e800c
|
Add FontLoader and transparent BG texture to the MyGUI plugin
|
2014-09-12 04:27:23 +02:00 |
|
Ragora
|
f9e2fd0f3d
|
Also forgot to remove a now unused variable I introduced
|
2014-09-11 20:47:14 -04:00 |
|
Ragora
|
efaa820ee2
|
Managed to forget the itemmodel.cpp code
|
2014-09-11 20:46:21 -04:00 |
|
Ragora
|
ea43a23505
|
All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map
|
2014-09-11 20:45:22 -04:00 |
|
Ragora
|
83868bca23
|
Removed unused include left over from experimentation
|
2014-09-11 19:37:00 -04:00 |
|
Ragora
|
ee6298f520
|
Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best
|
2014-09-11 19:33:45 -04:00 |
|
Marc Zinnschlag
|
b29d1d452f
|
removed some redundant checks
|
2014-09-11 14:19:18 +02:00 |
|
Marc Zinnschlag
|
5dd424b6c6
|
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
|
2014-09-11 14:14:02 +02:00 |
|
Marc Zinnschlag
|
717c1b15f5
|
fixed drop implementation for unpaged worldspace (wasn't updating cell object)
|
2014-09-11 13:08:30 +02:00 |
|
Marc Zinnschlag
|
0db288ce07
|
generalising and cleaning up drop implementation of worldspace widget
|
2014-09-11 13:04:20 +02:00 |
|
Marc Zinnschlag
|
5a9376450b
|
some cleanup of the scene view drop code
|
2014-09-11 11:27:56 +02:00 |
|
Marc Zinnschlag
|
b5d5eadf79
|
Merge remote-tracking branch 'scrawl/master'
|
2014-09-11 09:01:21 +02:00 |
|
Ragora
|
74e1db3ac8
|
Minor Correction to existing conjured item logic
|
2014-09-11 01:00:39 -04:00 |
|
scrawl
|
f3d4b63aaf
|
Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907)
|
2014-09-11 05:53:56 +02:00 |
|
Ragora
|
69dbd6b30f
|
Added checks for different bound item situations
|
2014-09-10 23:38:38 -04:00 |
|
scrawl
|
36a90198e2
|
Add option to change screenshot image format
|
2014-09-11 04:32:31 +02:00 |
|
Ragora
|
141755b473
|
Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them
|
2014-09-10 21:34:17 -04:00 |
|
scrawl
|
7fa3100993
|
Refactor TradeWindow balance buttons to use ControllerRepeatClick
|
2014-09-11 00:25:09 +02:00 |
|
cc9cii
|
88cf2bd597
|
Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected.
|
2014-09-11 07:27:48 +10:00 |
|