33361e6539
Merge branch 'master' into spellcreation
12 years ago
fe9120bcb3
Added support for the profiles and made creation/editing them more user friendly
12 years ago
a4855186c5
Merge remote-tracking branch 'upstream/master' into launcher-model
12 years ago
ab8894e07a
Merge remote-tracking branch 'origin/launcher-model' into launcher-model
...
Conflicts:
apps/launcher/datafilespage.cpp
12 years ago
6433b1e022
Some minor fixes
12 years ago
0547f11564
Issue #68 : Remove dead actors from actor list
12 years ago
f2e25b8a47
Issue #68 : Keep dead actors out of the actor list for the current scene
12 years ago
59560e84eb
small addition
12 years ago
b2b9254718
improved the ingredient GUI code (this didnt fix anything, though)
12 years ago
475163bd4a
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
fbe3538f32
bug #412 : sort birth signs
12 years ago
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
12 years ago
8d7514e341
corrected chance
12 years ago
d76522e7a4
searchPtrViaHandle
12 years ago
7884a927c9
Issue #68 : added dead flag to CreatureStats
12 years ago
a8f294c9ae
fixed types of dynamic stats script instructions
12 years ago
bdca5aff87
Issue #68 : simplified the dynamic stats interface
12 years ago
3f833af46a
Issue #407 : Fortyfy attribute effects were ignored for the last 3 attributes
12 years ago
28cc480ce1
fix some alchemy issues and make the gui use the new implementation
12 years ago
18686614db
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
12 years ago
1864dbe031
Issue #61 : potion creation
12 years ago
f5caf227b2
Issue #61 : remove ingredients on potion creation
12 years ago
3c71378fad
Issue 61: improved ingredients handling in alchemy and documenation
12 years ago
3fe0a73cf2
Issue #61 : increase alchemy skill on successful potion creation
12 years ago
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
12 years ago
5fbca239dd
Issue #61 : potion creation (1st part; still missing some implementations)
12 years ago
e80394c0b5
fix training limit
12 years ago
125315ebe7
remove a cout
12 years ago
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
12 years ago
1a2034b4dd
training window
12 years ago
6be092e268
substr check
12 years ago
84a4fd56c3
consider all files in Splash directory
12 years ago
6acbea822b
splash screen directory listing
12 years ago
7d1e659960
fading, greying out destinations you cant afford, warning fix
12 years ago
9583a1b8e9
FadeOut/In, that's for you scrawl!
12 years ago
c9afe222be
traveling now takes time
12 years ago
c991f68a2d
buying created spell
12 years ago
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
12 years ago
85aaacb41a
Some cleaning of the launcher source dir
12 years ago
bc95336183
Merge remote-tracking branch 'upstream/master' into launcher-model
12 years ago
f154031e54
last bits of the gui
12 years ago
b2025b9209
Merge branch 'pedantic'
12 years ago
e4a61486c8
Removed minor comments left in by accident.
12 years ago
68a856ff6f
Human readable labels for many records types. Human readable flags
...
for many record types. Improved DialInfo rule parsing. Discovered
several issues involving the assignment of various flag bits.
12 years ago
5773676986
Got the Data Files tab to use the new model
12 years ago
4174d3c235
Added new plugin model for the Data Files tab in the launcher
12 years ago
50e259c060
Remove tabs as requested. Sorry about that, thought I already
...
had. :-) I updated the help to better document the --type option,
although I did not finish reasoning through it's interaction with the
new loading framework. I also expanded the print() methods of a few
more of the record types to make a more consistent commit.
12 years ago
35d099a638
disabling gcc extensions
12 years ago
57f3b50dc8
Add more detail to ESMTool record dumping.
12 years ago
27a3487d78
right prices
12 years ago
5a611b66d7
traveling.
12 years ago
85d9357e3a
Travel GUI
12 years ago
025e820703
abstracted code and use it in enchanting window as well
12 years ago
1c0dd3ccc5
some editing code
12 years ago
332039da10
Issue #61 : replaced 4 ingredient member variables with vector in alchemy GUI
12 years ago
14833a4c3a
Issue #61 : More robust tools handling in alchemy window
12 years ago
1cc2c2055f
Issue #61 : Implemented basic ingredient handling in Alchemy class
12 years ago
6469933ce8
Merge branch 'master' into alchemy
...
Conflicts:
apps/openmw/mwgui/alchemywindow.cpp
12 years ago
21493c2dbd
added magic effect flags from Research wiki page
12 years ago
63fd8172d8
Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation
12 years ago
fa358ab196
change the inventory preview to "inventoryhandtohand" animation pose
12 years ago
ff2c2d2b96
Merge branch 'master' into spellcreation
...
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
12 years ago
d1c4559abe
fixed GMST string handling in GUI
12 years ago
35d7b5e5b0
Merge remote-tracking branch 'greye/record_saving'
12 years ago
29633bd02f
Merge remote-tracking branch 'greye/master'
12 years ago
f907a6a86f
updateListener() every frame
12 years ago
6c5c9ce46e
Avoid console spam when a sound can't play
12 years ago
6942fa97da
Specify a proper up vector for the listener
12 years ago
991f942fba
Merge remote-tracking branch 'zini/master' into sound
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.cpp
apps/openmw/mwsound/soundmanagerimp.hpp
12 years ago
2fa4ac177a
initial resolving
12 years ago
721324c1db
rm record inheritance, rework esmtool accordingly
12 years ago
10c8360e07
Issue #61 : Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class
12 years ago
42f02f3ccd
Issue #61 : Re-implemented tool selection in Alchemy class
12 years ago
20a263738a
Merge remote-tracking branch 'chris/animation'
12 years ago
41f80908d9
Simplify getting the stop time when playing all animation groups
12 years ago
2ab96d0108
Merge remote-tracking branch 'scrawl/next'
12 years ago
c6fd864a76
Issue #61 : Forgot to add some files
12 years ago
0c6ad13364
WakeUpPc instruction
12 years ago
cd8515396a
Use a multimap to store the text keys
12 years ago
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
12 years ago
4d496c1188
correction1
12 years ago
044ab3d2b6
fix error in framelistener with tcg enabled
12 years ago
1971ba66f1
destination name is now OK for every trave services
12 years ago
cd343c4fbd
Issue #61 : Basic alchemy class (doesn't do anything yet)
12 years ago
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
12 years ago
9b0254a158
small map fix
12 years ago
bb6d9a329c
Merge remote-tracking branch 'scrawl/book_skillgain' into next
12 years ago
3060fbee60
TravelGUI, not completly finished.
12 years ago
71d04e16da
fix the global map updating when pinned
12 years ago
caef570c8a
fix the weather not changing when sleeping/waiting
12 years ago
359824d614
oops
12 years ago
4453459378
re-use the texture across preview instances
12 years ago
e2b1329620
fix the race selection escape crash
12 years ago
d163f8203c
change books to RecListWithIDT
12 years ago
853d62adba
book skillgain
12 years ago
a34bdb9623
per NPC ID interaction tracking
12 years ago
b63d205c6e
change the select attribute/skill dialogs to be reusable
12 years ago
5bdc7bcacf
Merge branch 'master' into next
12 years ago
d393f551ed
edit effect dialog
12 years ago
02e7b3df4f
oops
12 years ago
f8a18d58a6
re-use the texture across preview instances
12 years ago
dd5c083124
fix the race selection escape crash
12 years ago
1339787863
remove underscores from filenames in esm
12 years ago
1cb1259e18
fixing some unrelated warnings
12 years ago
807a56c9e4
fix dynamic potion id
12 years ago
9d7c35ae48
and go
12 years ago
b4db339fd5
everything uses find now
12 years ago
9f2668b45b
Task #400 Review GMST access
12 years ago
f45a6b71a9
Merge branch 'master' into next
12 years ago
b471bef92a
Merge branch 'master' into next
12 years ago
39e21a6103
Merge remote-tracking branch 'scrawl/globalmap' into next
12 years ago
78b2d51cfc
fix a map crash
12 years ago
8da00caaa4
Merge remote-tracking branch 'scrawl/globalmap' into next
12 years ago
47d9fae89f
don't use cache
12 years ago
3560690660
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
b91d74d394
fix normalized encumbrance
12 years ago
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
12 years ago
28e2430f3a
Merge remote-tracking branch 'scrawl/master'
12 years ago
f49401bb53
center map on the player, dynamic map size
12 years ago
1d012d1680
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
12 years ago
9106e5307c
moved global map from RenderingManager to gui and removed world method
12 years ago
18cc435aa1
resolving conflicts
12 years ago
2d5ddd104b
Land::loadData rework
12 years ago
e69880f77e
almost perfect byte copies, has redundant data
12 years ago
a161b34c67
remove useless member, fix map rendering crash
12 years ago
98c1dc1151
ShowMap & FillMap commands, merged next
12 years ago
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
451a9fd6ac
don't update world arrow position in interior
12 years ago
e5e3d829d0
player arrow & markers
12 years ago
5f014f7411
oops, left in a testing assertion
12 years ago
86cfc91ef3
global map rendering
12 years ago
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
b9a3f8e8d7
gamma slider
12 years ago
d9f6072f02
gamma correct rendering & adjustment setting
12 years ago
ede9a2b170
fixed an orientation problem
12 years ago
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
12 years ago
a3c680d20a
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
be44810623
implemented GetPCSleep
12 years ago
bf5e30b24f
everything done except health/mana restore
12 years ago
ab698bb401
date time label
12 years ago
4d4ba6698a
fix character preview destruction; don't allow empty names in name dialog
12 years ago
0ba996f290
dialog layout
12 years ago
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
fcda3b6ca8
fixed some script argument types
12 years ago
ea8eab4f34
more cleanup
12 years ago
408c5b8bd4
some cleanup
12 years ago
4469976be9
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
3c1a9061de
Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly
12 years ago
032ff7c879
Clean-up. There is still a little bug.
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
scrawl
Pieter van der Kloet
Marc Zinnschlag
gugus
cfcohen
greye
Chris Robinson