gugus
|
faaa08d6d0
|
removed this stupide methode to generate unique ID.
|
14 years ago |
gugus
|
4546ca3863
|
static Objects goes inside the static geometry
|
14 years ago |
gugus
|
cd79df1d8b
|
Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation
Conflicts:
apps/openmw/mwrender/exterior.cpp
|
14 years ago |
Marc Zinnschlag
|
7192bc4f89
|
added static flag
|
14 years ago |
gugus
|
41d283a3aa
|
very experimental: static geometry.
|
14 years ago |
Marc Zinnschlag
|
64d6ee26bd
|
changed OGRE framelistener function from frameStarted to frameRenderingQueued
|
14 years ago |
Marc Zinnschlag
|
80691250ec
|
don't create a new virtual machine for each script and frame
|
14 years ago |
Pieter van der Kloet
|
eba813b4ac
|
Fixed clear button in the filter line-edit and changed "delete profile" icon
|
14 years ago |
Pieter van der Kloet
|
157822eeaf
|
Removed what's this? button from dialog titlebar
|
14 years ago |
Pieter van der Kloet
|
b877a94481
|
Modified the launcher to use the new multi-dir plugin approach
|
14 years ago |
Pieter van der Kloet
|
ac965af671
|
Moved functions around for better readability
|
14 years ago |
Pieter van der Kloet
|
d3143c6e52
|
Implemented filter function for the plugin list
|
14 years ago |
Pieter van der Kloet
|
9b439d74da
|
Removed some leftover files belonging to the old launcher
|
14 years ago |
Pieter van der Kloet
|
b9acc4a0ac
|
Implemented the Graphics page, launcher now loads and saves Ogre settings
|
14 years ago |
Pieter van der Kloet
|
409bd0fe7e
|
Moved the stylesheet to main.cpp and made some stylesheet-related changes
|
14 years ago |
Pieter van der Kloet
|
a0586cda99
|
Complete support for fallback icons on Windows using the Tango theme
|
14 years ago |
Pieter van der Kloet
|
76653cb2d5
|
Started working on fallback icons for Windows
|
14 years ago |
Pieter van der Kloet
|
7c1f00884d
|
Merge remote-tracking branch 'upstream/master' into newlauncher
|
14 years ago |
Marc Zinnschlag
|
8829398bfc
|
added --fs-strict switch
|
14 years ago |
Marc Zinnschlag
|
ef1e986a87
|
added --data-local switch
|
14 years ago |
Marc Zinnschlag
|
e60f0e3b38
|
--data switch accepts multiple directories now
|
14 years ago |
Marc Zinnschlag
|
6e880cffb2
|
changed engine class to support multiple data directories for esm files
|
14 years ago |
Pieter van der Kloet
|
1487daac3d
|
Fixed preprocessor #if to #ifdef
|
14 years ago |
Pieter van der Kloet
|
0ff068817e
|
Fixed icon and changed minimumsize
|
14 years ago |
Pieter van der Kloet
|
dbd37a6d58
|
Added messageboxes for game execution errors
|
14 years ago |
Pieter van der Kloet
|
2131452fac
|
Fixed file loading problem with relative paths when launcher wasn't run from cmdline
|
14 years ago |
Pieter van der Kloet
|
c42f99a586
|
Implemented starting the game by pressing either the big play button or the dialog play button
|
14 years ago |
Pieter van der Kloet
|
2b0dabe669
|
Changed profile switching again; Some stylesheet modifications
|
14 years ago |
Pieter van der Kloet
|
7bf21262a1
|
Plugins and masters from the current profile are written to openmw.cfg now
|
14 years ago |
Pieter van der Kloet
|
a68be84b7f
|
Re-implemented the profile combobox on the Play page
|
14 years ago |
Pieter van der Kloet
|
4dbdc1cb26
|
Implemented copy and delete profile functions
|
14 years ago |
Pieter van der Kloet
|
9e852a36bf
|
Changed all QList<> to const
|
14 years ago |
Pieter van der Kloet
|
ee4a2d0a8d
|
Fixed a problem with the currentprofile not being set in the combobox
|
14 years ago |
Pieter van der Kloet
|
ba3e4330f2
|
Changed the way the masters get retrieved in masterSelectionChanged
|
14 years ago |
Pieter van der Kloet
|
2e058409bd
|
Fixed problem with profile writeout
|
14 years ago |
Pieter van der Kloet
|
314bac7862
|
Preliminary support for new profiles and some other modifications and cleanups
|
14 years ago |
Pieter van der Kloet
|
557e659e15
|
CMake modifications, stylesheet gets copied to destination dir now
|
14 years ago |
Pieter van der Kloet
|
366ade0e5f
|
Modified Play page, widgets are now properly centered
|
14 years ago |
Pieter van der Kloet
|
8256343d77
|
Masters in the data directory are loaded now, even when they don't have dependent plugins
|
14 years ago |
Pieter van der Kloet
|
9a218b12c8
|
Deleted some leftover resource files
|
14 years ago |
Pieter van der Kloet
|
1fc18075ff
|
Modified config loading function to always read/write from userPath
There is no need for default (global) settings yet
|
14 years ago |
Pieter van der Kloet
|
7747c78584
|
Fixed the use of path.hpp, which is in a CMake component now
Also fixed some leftover lines from a wrongly modified conflict
|
14 years ago |
Pieter van der Kloet
|
7b554897e7
|
Merge remote-tracking branch 'upstream/master' into newlauncher
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
components/esm/defs.hpp
components/esm/loadappa.hpp
components/esm/loadbody.hpp
components/esm/loadclas.hpp
components/esm/loadcrea.hpp
components/esm/loadsndg.hpp
components/interpreter/installopcodes.cpp
|
14 years ago |
Pieter van der Kloet
|
24f2c57c32
|
Added missing resource file
|
14 years ago |
Pieter van der Kloet
|
4f18452ef6
|
Merged clean newlauncher branch with config
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilesdialog.cpp
apps/launcher/datafilesdialog.h
apps/launcher/lineedit.hpp
apps/launcher/maindialog.cpp
apps/launcher/resources.qrc
apps/launcher/resources/images/openmw-icon.png
|
14 years ago |
Pieter van der Kloet
|
e4129ce26e
|
Fixed config loading problem
|
14 years ago |
Pieter van der Kloet
|
64d636574e
|
More configfile stuff
|
14 years ago |
Pieter van der Kloet
|
0fc4767846
|
Some renaming and ugly support for getPath
|
14 years ago |
Pieter van der Kloet
|
4ee748552b
|
More messing around with the launcher config file
|
14 years ago |
Pieter van der Kloet
|
5f6b4a853f
|
Removed leftover files
|
14 years ago |
Jan-Peter Nilsson
|
1899e5dc1e
|
If there is an openmw.cfg in the current path, use it as global config
|
14 years ago |
Pieter van der Kloet
|
84ee3b585c
|
Added ability to get the previous profile when a new one is selected
|
14 years ago |
Pieter van der Kloet
|
04bc42a5c7
|
Added combobox slot for changing the profile
|
14 years ago |
Pieter van der Kloet
|
274bce22c3
|
Added writeConfig in Data Files tab and implemented the close button
|
14 years ago |
Pieter van der Kloet
|
5f19f6cfce
|
Added a function which returns the checked plugin names
|
14 years ago |
Pieter van der Kloet
|
e01afe1595
|
Included new header
|
14 years ago |
Pieter van der Kloet
|
c911f62e8b
|
Added ability to get the previous profile when a new one is selected
|
14 years ago |
Pieter van der Kloet
|
be47750a45
|
Added combobox slot for changing the profile
|
14 years ago |
Pieter van der Kloet
|
c68a4743bd
|
Added uncheck all function
|
14 years ago |
Pieter van der Kloet
|
a321685e7a
|
Modifications to the writeConfig function
|
14 years ago |
Pieter van der Kloet
|
8c4fad1f59
|
Added writeConfig in Data Files tab and implemented the close button
|
14 years ago |
Pieter van der Kloet
|
de78b81a8f
|
Added a function which returns the checked plugin names
|
14 years ago |
Pieter van der Kloet
|
c17eed26f3
|
Removed whitespace
|
14 years ago |
Pieter van der Kloet
|
a747bfb575
|
Moved the stylesheet to the Play page
|
14 years ago |
Pieter van der Kloet
|
8f679218bd
|
Added stylesheet implementation for the Play tab
|
14 years ago |
Pieter van der Kloet
|
94f3bc115f
|
Added missing resource file
|
14 years ago |
Marc Zinnschlag
|
d481222d92
|
all program options (except help) can now be used from a cfg file
|
14 years ago |
Marc Zinnschlag
|
6dba09462a
|
change in multi_es branch broke fps switch; fixed now
|
14 years ago |
Marc Zinnschlag
|
38c69f68c6
|
allow multiple --master and --plugin command line arguments
|
14 years ago |
Pieter van der Kloet
|
5754a132c5
|
More modifications
|
14 years ago |
Pieter van der Kloet
|
fc095b902d
|
Added some more new files
|
14 years ago |
Pieter van der Kloet
|
d1a75253d7
|
Huge rewrite, implementing all the new ideas for the launcher
|
14 years ago |
Marc Zinnschlag
|
5b6ec405e3
|
Merge branch 'script'
|
14 years ago |
Marc Zinnschlag
|
58cbdfd762
|
Merge branch 'journal'
|
14 years ago |
Marc Zinnschlag
|
8b9ee30924
|
user/global mixup
|
14 years ago |
Marc Zinnschlag
|
bdfd28f44d
|
adjusted components/files namespace; some related cleanup
|
14 years ago |
Marc Zinnschlag
|
7131c08ca4
|
moved path.hpp/path.cpp to a new component
|
14 years ago |
Jan-Peter Nilsson
|
4189704b5f
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
14 years ago |
Jan-Peter Nilsson
|
6aa1f3efdd
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
14 years ago |
Jan-Peter Nilsson
|
b22234109d
|
Remove unused variable (compiler warning)
|
14 years ago |
Pieter van der Kloet
|
fbdc10f0b0
|
Removed some leftover files and more testing
|
14 years ago |
Pieter van der Kloet
|
96e7df36e5
|
Added a proof-of-concept datafiles implementation to replace the old dialog
|
14 years ago |
Pieter van der Kloet
|
1e62d8451f
|
More testing and removing
|
14 years ago |
Pieter van der Kloet
|
74eef82902
|
Messing around with a new datafilesdialog
|
14 years ago |
Marc Zinnschlag
|
125319c441
|
splitting off console output from messageBox channel
|
14 years ago |
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
14 years ago |
Marc Zinnschlag
|
e18dde4571
|
added topic tracking
|
14 years ago |
Marc Zinnschlag
|
7a1b215b6a
|
splitting of topic class from quest class
|
14 years ago |
Marc Zinnschlag
|
3406d2fa89
|
removed redundant data from quest class
|
14 years ago |
Marc Zinnschlag
|
944291d34f
|
added quest tracking to the journal
|
14 years ago |
Marc Zinnschlag
|
fc2d659925
|
Merge remote branch 'jpn/config' into config
|
14 years ago |
Marc Zinnschlag
|
65e43c448a
|
splitted StampedJournalEntry class off from JournalEntry
|
14 years ago |
Marc Zinnschlag
|
f4f12e885f
|
all program options (except help) can now be used from a cfg file
|
14 years ago |
Marc Zinnschlag
|
8915e8a751
|
change in multi_es branch broke fps switch; fixed now
|
14 years ago |
Marc Zinnschlag
|
9ea99a46ee
|
Merge branch 'multi_es'
|
14 years ago |
Marc Zinnschlag
|
f3fecdc627
|
quest entries are added to main journal now
|
14 years ago |
Marc Zinnschlag
|
792de880cf
|
another constness fix
|
14 years ago |
Marc Zinnschlag
|
717b5e1784
|
fixed a constness problem
|
14 years ago |
Marc Zinnschlag
|
23464e4035
|
added interface and container for main journal
|
14 years ago |
Marc Zinnschlag
|
5851e0a28c
|
added journal entry struct
|
14 years ago |
Jason Hooks
|
92509d3b70
|
Trying to animate creatures
|
14 years ago |
Jason Hooks
|
2ac1cc8aee
|
Trying to animate creatures
|
14 years ago |
Jan-Peter Nilsson
|
f2faa34bd9
|
If there is an openmw.cfg in the current path, use it as global config
|
14 years ago |
Marc Zinnschlag
|
53e0e38862
|
added missing TCL instruction
|
14 years ago |
Marc Zinnschlag
|
f321e549a4
|
added instruction GetPCCell
|
14 years ago |
Marc Zinnschlag
|
e4a0702bb4
|
added journal-related script instructions
|
14 years ago |
Marc Zinnschlag
|
b40117449a
|
added journal script interface
|
14 years ago |
Marc Zinnschlag
|
190f77f6c9
|
added journal class
|
14 years ago |
Jan-Peter Nilsson
|
dc4e6216c3
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
14 years ago |
Jan-Peter Nilsson
|
a94de76801
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
14 years ago |
Jan-Peter Nilsson
|
2e2d490c78
|
Remove unused variable (compiler warning)
|
14 years ago |
Pieter van der Kloet
|
082902473b
|
Changed the readConfig function to work with the new master/plugin options in openmw.cfg
|
14 years ago |
Pieter van der Kloet
|
1d873c56a8
|
Fixed the "Restore defaults" function.
|
14 years ago |
Pieter van der Kloet
|
493018322d
|
Added function to write the list of plugins to openmw.cfg
|
14 years ago |
Pieter van der Kloet
|
aa54975a2f
|
Removed the directoryLoaded() signal as it's only available in Qt 4.7.
|
14 years ago |
Marc Zinnschlag
|
beb1422c77
|
allow multiple --master and --plugin command line arguments
|
14 years ago |
Pieter van der Kloet
|
7a03266729
|
Initial commit of the launcher
|
14 years ago |
Pieter van der Kloet
|
833a61dd82
|
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
|
14 years ago |
Marc Zinnschlag
|
53e1d0e7e7
|
more cleanup
|
14 years ago |
Marc Zinnschlag
|
a70e582ae2
|
removed debugging leftovers from the tab_complition branch
|
14 years ago |
Marc Zinnschlag
|
c571148bef
|
Merge branch 'collision'
|
14 years ago |
Marc Zinnschlag
|
5661dc27c2
|
removed a leftover from physics debugging
|
14 years ago |
gugus
|
3ad2b9986e
|
fix actors not beeing deleted. Need the latest OEngine.
|
14 years ago |
Marc Zinnschlag
|
d7226fc9c2
|
Merge branch 'tab_completion'
|
14 years ago |
Marc Zinnschlag
|
7144657cfc
|
Merge branch 'script'
|
14 years ago |
gugus
|
773b7635a4
|
decrease the range of the raycast, and modifie the gravity/speed of the player.
|
14 years ago |
Marc Zinnschlag
|
0866e4d4fe
|
fix: NPCs were not added to physics system
|
14 years ago |
Marc Zinnschlag
|
9946bb36f7
|
Merge remote branch 'gus/collision' into collision
|
14 years ago |
gugus
|
7a28c9f3aa
|
fix the door bug
|
14 years ago |
Marc Zinnschlag
|
7653caea27
|
Merge branch 'master' into collision
Conflicts:
apps/openmw/mwclass/npc.cpp
|
14 years ago |
gugus
|
0cc94c81d4
|
Merge remote branch 'upstream/collision' into collision
|
14 years ago |
Marc Zinnschlag
|
7b5d24c853
|
fixed a bug in phyiscs update code
|
14 years ago |
gugus
|
3dddcbd958
|
fix a camera problem and increase player speed
|
14 years ago |
Marc Zinnschlag
|
91ea36509d
|
gus' fly mode fix; manually applied
|
14 years ago |
Marc Zinnschlag
|
8788dcebcf
|
Merge remote branch 'gus/collisions' into collision
|
14 years ago |
gugus
|
8aeefd2af8
|
fix the fall bug when using ToggleCollision. Require lastest change with OEngine.
|
14 years ago |
Marc Zinnschlag
|
647e88003e
|
build and activation fix
|
14 years ago |
gugus
|
21c224af25
|
add gravity change to the ToggleCollisionMode function.
|
14 years ago |
gugus
|
102f1ee5dc
|
filled the toggleCollisionMode function. It needs the lastest change in OEngine
|
14 years ago |
gugus
|
2aee958789
|
Not sure about this commit: the PhysicEngine was initialized twice...
|
14 years ago |
Marc Zinnschlag
|
72ce493123
|
non-unique NPC ID workaround
|
14 years ago |
gugus
|
98b27813b7
|
change raycasting
|
14 years ago |
Marc Zinnschlag
|
72a84356e2
|
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
|
14 years ago |
Marc Zinnschlag
|
8ebdd77772
|
Merge branch 'collision' into script
|
14 years ago |
gugus
|
0fb2107265
|
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
apps/openmw/mwclass/npc.cpp
|
14 years ago |
Marc Zinnschlag
|
4100a72e8d
|
don't do physics calculations while the GUI is up
|
14 years ago |
Marc Zinnschlag
|
f1bfca7c7c
|
player class cleanup
|
14 years ago |
Marc Zinnschlag
|
eb93ef68f1
|
fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class
|
14 years ago |
Jan-Peter Nilsson
|
0f2152903e
|
Get rid of deprecated warning for eventWindowChangeCoord
|
14 years ago |
Jan-Peter Nilsson
|
f83c5327f3
|
Move eventDone to WindowBase and make it tell which window is done
|
14 years ago |