Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 19:52:14 +02:00
riothamus
36f1197b51
Bug 752, cleanup
2013-05-16 13:51:54 -04:00
riothamus
db981a72fe
Bug 752
2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179
Merge remote-tracking branch 'scrawl/persistence'
2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
graffy76
13242c2bd5
Eliminated code centering the initial view in the middle of the screen
2013-05-16 10:14:13 -05:00
Glorf
af28be915f
Use fallback video name
2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c
Bugfix #778
2013-05-16 13:35:28 +02:00
Marc Zinnschlag
9fee99d56c
Merge remote-tracking branch 'scrawl/master'
2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999
Some fixes
2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Marc Zinnschlag
56b2b05f9a
Merge remote-tracking branch 'glorf/weather'
2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363
Corrected celestical object sizes
2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277
Playing with moons part 2
2013-05-14 19:58:08 +02:00
Marc Zinnschlag
d684120f7a
Merge remote-tracking branch 'scrawl/master'
2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d
Fix the frame update not getting called on the first frame
2013-05-13 20:08:12 +02:00
Torben Carrington
4d10a1c407
Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)
2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382
fixed AiWander arguments
2013-05-13 11:27:36 +02:00
graffy76
c71d921f09
Moved signalUpdateEditorSettings from UserSettingsDialog to
...
UserSettings.
UserSettings is now derived from QObject.
2013-05-12 15:15:57 -05:00
graffy76
144be59735
Changed enum names to match OpenMW naming conventions
2013-05-12 14:28:36 -05:00
Marc Zinnschlag
9835c6df11
Merge remote-tracking branch 'scrawl/tradefix'
2013-05-12 12:58:32 +02:00
graffy76
88df3b980f
Implemented UserSettings as a singleton.
2013-05-11 20:55:36 -05:00
scrawl
b56d50287e
Barter mechanic fix
2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f
Merge remote-tracking branch 'scrawl/containerui'
2013-05-11 19:23:02 +02:00
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
graffy76
d0b23a4786
Relocated "User Settings" to Edit->Preferences
...
Removed <QDebug> reference from view.hpp
2013-05-11 07:40:10 -05:00
graffy76
a8b45e0a13
Three primary changes:
...
1. Declared QStringPair::isEmpty() const
2. Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3. Declared several classes as _noqt in CMakeLists.txt for OpenCS
2013-05-11 05:55:46 -05:00
Glorf
6aaa8d6dc0
Fixed fading problem
2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81
Playing with moons part 1
2013-05-10 18:55:56 +02:00
graffy76
8d0f350446
New file structure separating view classes from model classes. Deleted
...
.ui file.
2013-05-10 10:00:58 -05:00
kpp
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
Marc Zinnschlag
5c99f15ad3
Merge remote-tracking branch 'torben/aiescort'
2013-05-09 14:27:22 +02:00
Glorf
6417fa504e
Fixed constness
2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079
Removed sqrt function call (minor optimization thanks to Chris)
2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56
Removed unnecessary std::cout messages
2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4
AIEscort complete
2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5
AIEscort implemented and working - only touchups are needed.
2013-05-08 17:19:47 -07:00
Glorf
c605f15a15
Another weather cleanup
2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9
Framework - duration and pathing implemented, no waiting for follower yet.
2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8
minor cleanup
2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16
Merge remote-tracking branch 'gus/AIFix'
2013-05-08 20:31:57 +02:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02:00
graffy76
cb9c82324c
UserSettings system
2013-05-07 20:36:34 -05:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
gus
603af21715
little interface improvement
2013-05-07 19:42:21 +01:00
gus
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
2013-05-07 19:35:10 +01:00
scrawl
301efb411e
Fix exit crash
2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
Glorf
68f249e8f4
Small weather cleanup
2013-05-07 10:27:37 +02:00