October 2006 Commit Log

« Development Statistics for Mercury

Commit Logs

Number of Commits:: 200
Number of Active Developers:: 3

cnlohr 2006-10-27 02:30 #200

messing around a little more...

15 lines of code changed in:

src: ODEFluid.cpp (+10 -7), ScreenFPS.cpp (+5 -5)

cnlohr 2006-10-27 02:17 #199

Just screwin' around with water... Maybe something cool will come of it.

165 lines of code changed in:

src: ODEFluid.cpp (new 104), ODEFluid.h (new 61)

cnlohr 2006-10-26 01:50 #198

Tweak -- set the mouse's position to WindowX+200,WindowY+200

22 lines of code changed in:

src: MercuryInputWin32.cpp (+6 -4), Win32Window.cpp (+16 -10)

cnlohr 2006-10-24 02:20 #197

some more vector->MVector stuff... but this brings up a deeper question about where that get channel info command is...

1 lines of code changed in:

src: MercuryScreen.h (-1), MercurySound.h (+1 -3)

cnlohr 2006-10-24 02:18 #196

shift around windows.h; speeds up compile by about 2 seconds

1 lines of code changed in:

src: MercuryInputWin32.cpp (+1), MercuryInputWin32.h (-1)

cnlohr 2006-10-24 02:09 #195

Remove unneeded includes

0 lines of code changed in:

src: Mercury.cpp (-2), MercuryTheme.h (-1)

cnlohr 2006-10-24 02:08 #194

We should be trying to use MStrings and avoid string as much as we can.

9 lines of code changed in:

src: ShaderComposer.cpp (+7 -5), ShaderComposer.h (+2 -6)

cnlohr 2006-10-23 20:09 #193

Fix 2k3 build

12 lines of code changed in:

src: Mercury-VC2003.vcproj (+12)

cnlohr 2006-10-23 20:09 #192

Fix: in .net2k5 the compiler doesn't know how to do place new on unsigned int's unless you add in new.h :(

5 lines of code changed in:

src: MercuryGeometry.h (+5)

cnlohr 2006-10-23 20:08 #191

Apparently VC.net2k5 and MAYBE GCC4 have change the order they do assignment operations.

1 lines of code changed in:

src: MercuryMatrixStack.h (+1 -1)

cnlohr 2006-10-23 20:07 #190

Fix VC2k5 compile

1 lines of code changed in:

src: MercuryVector.h (+1 -1)

cnlohr 2006-10-23 15:18 #189

Update vector to prevent overwriting of modified stuff.
&
Update skybox

12 lines of code changed in:

Themes/default/Models/Skybox: Skybox.hgmdl.Material01.ini (+1 -1), Skybox.hgmdl.Material03.ini (+1 -1), Skybox.hgmdl.Material05.ini (+1 -1), Skybox.hgmdl.Material06.ini (+1 -1), Skybox.hgmdl.Material07.ini (+1 -1), Skybox.hgmdl.Material08.ini (+1 -1)
src: MercuryVector.h (+6 -4)

cnlohr 2006-10-23 14:11 #188

Oops, put this back in order

3 lines of code changed in:

src: MercuryDisplay.cpp (+3 -3)

cnlohr 2006-10-23 13:28 #187

Update linux build, it still crashes when resizing, then deleting vectors.

21 lines of code changed in:

src: Makefile.am (+1 -1), MercuryDisplay.cpp (+6 -5), MercuryInputSDL.cpp (+4 -4), MercuryTypes.cpp (+1 -1), MercuryUtil.h (+6 -4), MercuryVector.h (+3 -1)

cnlohr 2006-10-23 01:51 #186

Use pre-processed object commands for the FPS camera.

12 lines of code changed in:

src: ScreenFPS.cpp (+12 -4)

cnlohr 2006-10-23 00:57 #185

MASSIVE commit. It may need to be reverted. It is not tested under all architectures.

It's done right after midnight on 10/23/2006 so it can be easily reverted.

(fingers crossed)

149 lines of code changed in:

src: CopperWindow.h (+1 -1), MerCadBase.cpp (+10 -10), MerCadBase.h (+10 -8), MerCadBaseComponents.cpp (+1 -1), Mercury.dsp (+5 -5), MercuryCommands.h (+1 -1), MercuryDisplay.cpp (+3 -4), MercuryDisplay.h (+1 -1), MercuryDisplaySoftwareC.h (+1 -1), MercuryFiles.cpp (+8 -8), MercuryFiles.h (+8 -8), MercuryINI.cpp (+3 -3), MercuryINI.h (+3 -3), MercuryInput.cpp (+2 -2), MercuryInput.h (+5 -4), MercuryInputSDL.h (+1 -6), MercuryInputWin32.cpp (+4 -4), MercuryInputWin32.h (+1 -6), MercuryMessages.cpp (+6 -6), MercuryMessages.h (+1 -2), MercuryModel.cpp (+1 -1), MercuryModel.h (+1 -1), MercuryODE.cpp (+10 -3), MercuryODE.h (+6 -6), MercuryOGL_Ext.cpp (+3 -1), MercuryOGL_Ext.h (+1 -1), MercuryObject.cpp (+1 -1), MercuryObject.h (+2 -2), MercuryObjectCommands.cpp (+2), MercuryObjectCommands.h (+6 -7), MercuryPoly.h (-2), MercuryScreenManager.h (-2), MercuryShapes.cpp (+1 -1), MercuryShapes.h (+1 -1), MercurySprite.cpp (+1 -1), MercurySprite.h (+1 -1), MercuryText.cpp (+1 -1), MercuryText.h (+1 -1), MercuryTextureManager.cpp (+13 -12), MercuryTextureManager.h (+3 -4), MercuryTheme.cpp (+3 -3), MercuryTheme.h (+1 -1), MercuryTypes.cpp (+1), MercuryUtil.cpp (+1 -1), MercuryUtil.h (+2 -4), PStack.cpp (+6 -6), PStack.h (+2 -2), ScreenMapEditor.cpp (+2 -2), ScreenMapEditor.h (+1 -1)

cnlohr 2006-10-23 00:55 #184

Move MercuryUtil below the class definition of MVector, since MercuryUtil uses MVector now.

Also, convert all construct's to place new's. and destruct to ->~T()'s

51 lines of code changed in:

src: MercuryVector.h (+51 -27)

cnlohr 2006-10-23 00:51 #183

Use 0 instead of NULL. Some files global.h gets included in dont define NULL to be 0 by the time global.h gets included

3 lines of code changed in:

src: global.h (+3 -3)

cnlohr 2006-10-22 17:02 #182

eradicate the STL Lists's use in Mercury

13 lines of code changed in:

src: MercuryDisplayEE.h (-1), MercuryMesh.cpp (+4 -4), MercuryMesh.h (+1 -3), MercuryModel.h (+2 -2), MercurySoundManager.cpp (+1 -1), MercurySoundManager.h (+1 -2), MercuryTextureManager.cpp (+1 -1), MercuryVertex.h (+3 -5)

cnlohr 2006-10-22 16:46 #181

Use another MDeque

9 lines of code changed in:

src: MercuryDisplay.cpp (+5 -5), MercuryDisplay.h (+4 -4)

cnlohr 2006-10-22 16:45 #180

Just use pointers, instead of new and delete, this saves a lot of time (I have profiler proof)

9 lines of code changed in:

src: MercuryMatrixStack.h (+9 -9)

axlecrusher 2006-10-21 22:30 #179

add things fot trying to generate a shadow map

269 lines of code changed in:

src: MercuryDisplay.cpp (+3), MercuryDisplay.h (+12 -2), MercuryDisplaySoftwareC.h (+3), MercuryOGL.cpp (+247 -2), MercuryOGL.h (+4)

axlecrusher 2006-10-21 10:21 #178

Fix

2 lines of code changed in:

src: ScreenHelloWorld.cpp (+2 -2)

cnlohr 2006-10-21 04:10 #177

Use a hash for the object register; this looks like it sped up object creation/deletion by a factor of 1.5

61 lines of code changed in:

src: MercuryObject.cpp (+17 -19), MercuryObject.h (+2 -2), MercuryVector.h (+42)

cnlohr 2006-10-21 03:35 #176

Super optimize MercuryLoadableModel, even use hash tables instead of maps.

27 lines of code changed in:

src: MercuryLoadableModel.cpp (+16 -18), MercuryLoadableModel.h (+9 -9), ScreenFPS.h (+1 -1), ScreenTitle.cpp (+1 -1)

cnlohr 2006-10-21 03:31 #175

add .empty() to mvector, and make the default hash table size a not-so-collision-creating-number

2 lines of code changed in:

src: MercuryVector.h (+2 -1)

cnlohr 2006-10-21 02:10 #174

Convert to new system

3 lines of code changed in:

src: ScreenGameForBlind.cpp (+3 -3)

cnlohr 2006-10-20 22:38 #173

fix linux compile

27 lines of code changed in:

src: MercuryMath.cpp (+3 -3), MercuryMath.h (+3 -3), MercuryOGL.cpp (-4), MercuryOGL_Ext.cpp (+13 -13), MercuryVector.h (+7 -6), ShaderComposer.h (+1 -1)

axlecrusher 2006-10-20 21:08 #172

Fix crash from screen's destructor removing the screen from the manager

1 lines of code changed in:

src: MercuryScreen.cpp (-11), MercuryScreen.h (-2), MercuryScreenManager.cpp (+1 -2)

ultramn 2006-10-20 12:39 #171

*** empty log message ***

2 lines of code changed in:

src: MercuryOGL.cpp (+2 -4)

ultramn 2006-10-20 12:18 #170

*** empty log message ***

17 lines of code changed in:

src: MercuryOGL.cpp (+10 -5), MercuryOGL.h (+7 -1)

cnlohr 2006-10-20 02:05 #169

Map editor is converted

19 lines of code changed in:

src: ScreenMapEditor.cpp (+18 -17), ScreenMapEditor.h (+1 -1)

cnlohr 2006-10-20 02:00 #168

m_camera stuff

19 lines of code changed in:

src: MercuryScreen.cpp (+6 -2), ScreenODETest.cpp (+13 -11), ScreenODETest.h (-1)

cnlohr 2006-10-20 02:00 #167

deque is a STL class

8 lines of code changed in:

src: MercuryObject.h (+8 -8)

axlecrusher 2006-10-20 01:45 #166

forgot this

5 lines of code changed in:

src: MercuryScreen.cpp (+5)

axlecrusher 2006-10-18 17:28 #165

don't automatically change settings

1 lines of code changed in:

src: MercuryDisplay.cpp (+1 -22), MercuryDisplay.h (-1)

axlecrusher 2006-10-18 15:56 #164

fix sorting in screen

14 lines of code changed in:

src: MercuryObject.h (+3 -2), MercuryScreen.cpp (+9 -9), MercuryScreen.h (+2 -2)

axlecrusher 2006-10-18 15:51 #163

remove

0 lines of code changed in:

src: ScreenCopper.cpp (-2)

axlecrusher 2006-10-18 11:48 #162

Update

14 lines of code changed in:

src: ScreenCopper.cpp (+3 -3), ScreenDebugOverlay.cpp (+7 -7), ScreenTitle.cpp (+4 -4)

axlecrusher 2006-10-18 11:48 #161

Fix text scaling

1 lines of code changed in:

src: MercuryText.cpp (+1)

axlecrusher 2006-10-18 11:47 #160

Fix sprites

12 lines of code changed in:

src: MercurySprite.cpp (+8 -5), MercurySprite.h (+4 -1)

axlecrusher 2006-10-18 01:25 #159

Fix spawn for screen

18 lines of code changed in:

src: MercuryObject.cpp (+1 -1), MercuryObject.h (+1 -1), MercuryScreen.cpp (+14), MercuryScreen.h (+2)

axlecrusher 2006-10-18 01:18 #158

seperate orthographic and perspective projection objects in the screen

99 lines of code changed in:

src: MercuryScreen.cpp (+77 -3), MercuryScreen.h (+18), ScreenFPS.cpp (+4 -4)

axlecrusher 2006-10-18 01:17 #157

comment out ortho/sprite stuff for now

3 lines of code changed in:

src: ScreenTitle.cpp (+3 -3)

axlecrusher 2006-10-18 01:16 #156

Template the draw sort and make some fucntions virtual and give custom render function

74 lines of code changed in:

src: MercuryObject.cpp (+15 -50), MercuryObject.h (+59 -5)

axlecrusher 2006-10-18 01:14 #155

comparisons

4 lines of code changed in:

src: MercuryObjectBase.h (+4 -1)

axlecrusher 2006-10-18 01:12 #154

Objects no longer control their projection.
(anything that is sprite based still needs a lot of work)

22 lines of code changed in:

src: MercuryParticle.cpp (+3 -3), MercurySprite.cpp (+7 -7), MercuryText.cpp (+1 -1), ODEProjectile.cpp (+2 -2), ScreenCopper.cpp (+1 -1), ScreenDebugOverlay.cpp (+1 -1), ScreenGameForBlind.cpp (+1 -1), ScreenHelloWorld.cpp (+1 -1), ScreenMapEditor.cpp (+4 -4), ScreenMerCad.cpp (+1 -1)

cnlohr 2006-10-17 02:15 #153

update the doxygen configuration

5 lines of code changed in:

Doxygen: doxygen_config (+5 -5)

cnlohr 2006-10-17 02:15 #152

commenting

37 lines of code changed in:

src: MercuryLoadableModel.h (+7), MercuryODE.h (+1), MercuryTypes.h (+29 -13)

cnlohr 2006-10-16 13:57 #151

comment the deque/hash

47 lines of code changed in:

src: MercuryVector.h (+47 -21)

cnlohr 2006-10-16 13:14 #150

FINALLY! Fix the damn screen deletion issue!

19 lines of code changed in:

src: MercuryScreenManager.cpp (+18 -22), MercuryScreenManager.h (+1 -1)

cnlohr 2006-10-16 12:47 #149

Fix object sorting.

69 lines of code changed in:

src: MercuryObject.cpp (+2 -4), MercuryVector.h (+67)

axlecrusher 2006-10-15 16:05 #148

8bit stencil

1 lines of code changed in:

src: Win32Window.cpp (+1 -1)

axlecrusher 2006-10-15 16:05 #147

Add functions

119 lines of code changed in:

src: MercuryDisplay.h (+5), MercuryDisplaySoftwareC.h (+5), MercuryDisplayTypes.h (+22), MercuryOGL.cpp (+79 -1), MercuryOGL.h (+8)

cnlohr 2006-10-14 23:56 #146

Update project file

8 lines of code changed in:

src: Mercury.dsp (+8)

cnlohr 2006-10-14 16:36 #145

Don't make directX includes use MercuryMemory

2 lines of code changed in:

src: MercuryDisplay_D3D.cpp (+2 -2)

cnlohr 2006-10-14 16:35 #144

Fix circular issue, since we won't be missing this leaked data, it's not a big worry.

8 lines of code changed in:

src: MercuryMemory.cpp (+8 -2)

cnlohr 2006-10-14 16:12 #143

Fix ambiguous ! operator, in favor of FAIL, so we actually get a clear reason for failure.

1 lines of code changed in:

src: MercuryTheme.cpp (+1 -1)

cnlohr 2006-10-14 16:04 #142

Make the screen deletion thing actually work and not leak on .net2k5 and others

8 lines of code changed in:

src: MercuryScreenManager.cpp (+8 -9)

axlecrusher 2006-10-14 15:41 #141

fix uninitialized variable

1 lines of code changed in:

src: MercuryString.cpp (+1 -1)

axlecrusher 2006-10-14 15:41 #140

Revert, see comment in .h

1 lines of code changed in:

src: MercuryString.h (+1 -1)

cnlohr 2006-10-14 15:34 #139

Fix memory leak when making a windows-based thread

1 lines of code changed in:

src: MercuryThreads.cpp (+1)

cnlohr 2006-10-14 15:05 #138

Add: Fail macro, to forcively fail, it's done this way to mimic the way ASSERT is written.

1 lines of code changed in:

src: MercuryUtil.h (+1)

cnlohr 2006-10-14 15:03 #137

Add: MHash table

72 lines of code changed in:

src: MercuryVector.h (+72)

cnlohr 2006-10-14 15:01 #136

Make string be able to be straight casted to an int, for hashing purposes.

1 lines of code changed in:

src: MercuryString.h (+1)

axlecrusher 2006-10-13 20:48 #135

add file

4 lines of code changed in:

src: Mercury-VC2005.vcproj (+4)

cnlohr 2006-10-13 20:40 #134

change formatting of hash, to lowercase, like the rest of string

3 lines of code changed in:

src: MercuryString.cpp (+1 -1), MercuryString.h (+2 -1)

cnlohr 2006-10-13 20:39 #133

floating point warning

2 lines of code changed in:

src: ExplodingCokeCan.cpp (+1 -1), ScreenFPS.cpp (+1 -1)

cnlohr 2006-10-13 20:38 #132

Add hash function

15 lines of code changed in:

src: MercuryString.cpp (+14), MercuryString.h (+1)

axlecrusher 2006-10-13 20:34 #131

Try to clean up, and log to info file.

22 lines of code changed in:

src: MercuryOGL.cpp (+22 -25)

axlecrusher 2006-10-13 20:07 #130

Move compiler into own function

70 lines of code changed in:

src: MercuryOGL.cpp (+69 -65), MercuryOGL.h (+1)

ultramn 2006-10-13 20:03 #129

*** empty log message ***

390 lines of code changed in:

src: ShaderComposer.cpp (new 359), ShaderComposer.h (new 31)

axlecrusher 2006-10-13 17:44 #128

Quaternion rotations

12 lines of code changed in:

src: MercuryDisplay.cpp (+5), MercuryObjectBase.h (+7)

axlecrusher 2006-10-13 17:41 #127

Use quaternion

2 lines of code changed in:

src: MercuryODE.cpp (+2 -25), MercuryODE.h (-4)

axlecrusher 2006-10-13 17:40 #126

flaot* constructor

1 lines of code changed in:

src: MercuryTypes.h (+1)

ultramn 2006-10-13 12:55 #125

Pixelshaders NYW

168 lines of code changed in:

src: MercuryGLExt.cpp (+1), MercuryGLExt.h (+1), MercuryOGL.cpp (+114), MercuryOGL.h (+4), MercuryOGL_Ext.cpp (+33), MercuryOGL_Ext.h (+15)

cnlohr 2006-10-13 02:50 #124

Update & Make ASSERT() actually write a crash log with all important info.

10 lines of code changed in:

src: Mercury.dsp (+8), MercuryUtil.cpp (+1), MercuryUtil.h (+1 -1)

axlecrusher 2006-10-13 00:43 #123

max lights

3 lines of code changed in:

src: MercuryOGL.cpp (+2 -1), MercuryOGL.h (+1)

axlecrusher 2006-10-12 20:57 #122

only slow down for the first one

1 lines of code changed in:

src: ScreenFPS.cpp (+1 -1)

axlecrusher 2006-10-12 20:57 #121

make it bright

2 lines of code changed in:

src: ExplodingCokeCan.cpp (+2)

axlecrusher 2006-10-12 20:34 #120

update

1 lines of code changed in:

Themes/default: metrics.ini (+1)

axlecrusher 2006-10-12 20:33 #119

Light for coke cans too

13 lines of code changed in:

src: ExplodingCokeCan.cpp (+13)

axlecrusher 2006-10-12 20:19 #118

notes

3 lines of code changed in:

src: MercuryLight.h (+1), MercuryOGL.cpp (+2)

cnlohr 2006-10-12 20:09 #117

Update project + Add ability to do pre-cycle updates

12 lines of code changed in:

src: Mercury.dsp (+8), MercuryODE.cpp (+3), MercuryODE.h (+1 -1)

axlecrusher 2006-10-12 17:53 #116

new target thingy

0 lines of code changed in:

Themes/default/Graphics: targetret.png (new)

axlecrusher 2006-10-12 17:52 #115

light tween

1 lines of code changed in:

Themes/default: metrics.ini (+1)

axlecrusher 2006-10-12 17:50 #114

Update targeting sprite and use dynamic lights

15 lines of code changed in:

src: ScreenFPS.cpp (+15 -2)

axlecrusher 2006-10-12 17:49 #113

Make lights use more of mercury object

18 lines of code changed in:

src: MercuryLight.cpp (+10 -1), MercuryLight.h (+8 -14)

axlecrusher 2006-10-12 17:47 #112

Use material for lights

4 lines of code changed in:

src: MercuryOGL.cpp (+4 -3)

axlecrusher 2006-10-12 17:46 #111

comment

2 lines of code changed in:

src: MercuryDisplay.h (+2 -2)

axlecrusher 2006-10-11 22:27 #110

move a can

5 lines of code changed in:

Themes/default/Files: myworld2.ini (+5 -5)

cnlohr 2006-10-11 22:18 #109

update for screen

8 lines of code changed in:

Themes/default: metrics.ini (+8 -2)

cnlohr 2006-10-11 21:11 #108

Shift light & More viewing angle

19 lines of code changed in:

src: ScreenFPS.cpp (+4 -12), ScreenFPS.h (-1), ScreenOutdoors.cpp (+12), ScreenOutdoors.h (+3)

cnlohr 2006-10-11 21:11 #107

Correct angle

1 lines of code changed in:

src: ODEProjectile.cpp (+1 -1)

axlecrusher 2006-10-11 15:19 #106

update marble

5 lines of code changed in:

Themes/default/Graphics: Marble.ini (+5 -5), marble.png (new)

axlecrusher 2006-10-11 15:17 #105

Position the light correctly

3 lines of code changed in:

src: ScreenFPS.cpp (+3 -3)

axlecrusher 2006-10-11 14:34 #104

FIx jitter. Also we don't need to scale the box.

1 lines of code changed in:

src: ScreenOutdoors.cpp (+1 -2)

axlecrusher 2006-10-11 14:20 #103

add screen

8 lines of code changed in:

src: Mercury-VC2005.vcproj (+8)

axlecrusher 2006-10-11 14:19 #102

Update

15 lines of code changed in:

src: ScreenFPS.cpp (+2 -2), ScreenMapEditor.cpp (+1 -1), ScreenOutdoors.cpp (+11 -7), ScreenTitle.cpp (+1 -1)

axlecrusher 2006-10-11 14:18 #101

add camera

19 lines of code changed in:

src: MercuryScreen.cpp (+16 -6), MercuryScreen.h (+3 -1)

axlecrusher 2006-10-11 14:15 #100

set camera

4 lines of code changed in:

src: ScreenFPS.cpp (+4 -4)

axlecrusher 2006-10-11 14:14 #99

pointer

1 lines of code changed in:

src: ScreenOutdoors.h (+1 -1)

cnlohr 2006-10-11 12:39 #98

Update -- remove the visibility of the sides and marblize the balls

3 lines of code changed in:

Themes/default/Files: myworld2.ini (+3 -3)

cnlohr 2006-10-11 01:23 #97

Marble and Explosion Textures.

25 lines of code changed in:

Themes/default/Graphics: Explosion.ini (new 11), Marble.ini (new 14)

cnlohr 2006-10-11 01:22 #96

Outdoors Screen!

111 lines of code changed in:

src: ScreenOutdoors.cpp (new 62), ScreenOutdoors.h (new 49)

cnlohr 2006-10-11 01:22 #95

Update project (and use skybox)

15 lines of code changed in:

src: ExplodingCokeCan.cpp (+1 -1), MercuryObject.h (+2 -1), ScreenFPS.cpp (+9 -8), ScreenFPS.h (+3 -3)

cnlohr 2006-10-11 01:21 #94

ASSERT now actually says the file and line number the problem occured on.

3 lines of code changed in:

src: MercuryUtil.h (+3 -3)

cnlohr 2006-10-11 01:18 #93

New metrics for outdoor world

62 lines of code changed in:

Themes/default: metrics.ini (+1)
Themes/default/Models/Skybox: Skybox.hgmdl (new), Skybox.hgmdl.Material01.ini (new 10), Skybox.hgmdl.Material03.ini (new 10), Skybox.hgmdl.Material05.ini (new 10), Skybox.hgmdl.Material06.ini (new 10), Skybox.hgmdl.Material07.ini (new 10), Skybox.hgmdl.Material08.ini (new 10), info.txt (new 1), neg_x.PNG (new), neg_y.PNG (new), neg_z.PNG (new), pos_x.PNG (new), pos_y.PNG (new), pos_z.PNG (new)

axlecrusher 2006-10-11 00:35 #92

toggle z buffer writing

3 lines of code changed in:

src: MercuryScreen.cpp (+3 -2)

axlecrusher 2006-10-11 00:32 #91

toggle zbuffer writing

10 lines of code changed in:

src: MercuryDisplay.h (+2), MercuryDisplaySoftwareC.h (+2), MercuryOGL.cpp (+5), MercuryOGL.h (+1)

axlecrusher 2006-10-10 15:21 #90

construct from previous values

2 lines of code changed in:

src: MercuryMatrix.cpp (+2 -3)

axlecrusher 2006-10-10 14:28 #89

const

1 lines of code changed in:

src: MercuryLight.h (+1 -1)

axlecrusher 2006-10-10 09:37 #88

common light processing function

39 lines of code changed in:

src: MercuryOGL.cpp (+38 -66), MercuryOGL.h (+1)

axlecrusher 2006-10-10 09:22 #87

*sigh* Make different types of lights work for dynamic lights too.

8 lines of code changed in:

src: MercuryOGL.cpp (+8 -2)

cnlohr 2006-10-10 02:07 #86

And that would explain the crappy normal calculations

1 lines of code changed in:

src: MercuryMesh.cpp (+1 -1)

cnlohr 2006-10-09 23:51 #85

Add point lighting

20 lines of code changed in:

src: MercuryLight.cpp (+2), MercuryLight.h (+11 -2), MercuryOGL.cpp (+7 -1)

axlecrusher 2006-10-09 14:01 #84

only move camera on first explosion

33 lines of code changed in:

src: ScreenFPS.cpp (+30 -23), ScreenFPS.h (+3)

axlecrusher 2006-10-09 13:06 #83

show robot

1 lines of code changed in:

src: ScreenFPS.cpp (+1)

cnlohr 2006-10-09 00:57 #82

don't freeze camera when in 3rd person and blowing something up

1 lines of code changed in:

src: ScreenFPS.cpp (+1)

axlecrusher 2006-10-08 22:51 #81

Tweak bullet time

51 lines of code changed in:

src: ExplodingCokeCan.cpp (+6 -1), ScreenFPS.cpp (+45 -21)

axlecrusher 2006-10-08 21:53 #80

eXtreamly kick ass bullet time

20 lines of code changed in:

src: ScreenFPS.cpp (+18 -2), ScreenFPS.h (+2)

axlecrusher 2006-10-08 21:52 #79

fade out cans

1 lines of code changed in:

Themes/default: metrics.ini (+1 -1)

cnlohr 2006-10-08 20:55 #78

up the gravity some

1 lines of code changed in:

Themes/default/Files: myworld2.ini (+1 -1)

axlecrusher 2006-10-08 19:36 #77

Version 3

13 lines of code changed in:

src: MercuryMaterial.cpp (+13)

axlecrusher 2006-10-08 19:34 #76

Grass

5 lines of code changed in:

Themes/default/Models: grass.png (new), terrain.hgmdl.Material01.ini (+5 -2)

axlecrusher 2006-10-08 13:54 #75

always use matrix from the texture stack

7 lines of code changed in:

src: MercuryOGL.cpp (+7 -7)

axlecrusher 2006-10-07 23:35 #74

compile without d3d

88 lines of code changed in:

src: Mercury-VC2005.vcproj (+88)

axlecrusher 2006-10-07 23:34 #73

#USE_D3D

2 lines of code changed in:

src: MercuryDisplay.cpp (+2)

axlecrusher 2006-10-07 23:30 #72

header cleanup

1 lines of code changed in:

src: MercuryMath.cpp (-2), MercuryMath.h (-1), MercuryMatrix.h (+1 -4)

axlecrusher 2006-10-07 18:28 #71

null on destruction just to be safe

1 lines of code changed in:

src: MercuryVector.h (+1)

cnlohr 2006-10-07 18:24 #70

Skip unessiary step

0 lines of code changed in:

src: MercuryVector.h (-4)

cnlohr 2006-10-07 18:21 #69

OOps... we really have to say the new head's previous is null!

6 lines of code changed in:

src: MercuryVector.h (+6 -6)

cnlohr 2006-10-07 18:05 #68

Oops that shouldn't have been committed

0 lines of code changed in:

src: Mercury.cpp (-20)

axlecrusher 2006-10-07 17:51 #67

MDeque

3 lines of code changed in:

src: MercuryMessages.cpp (+1 -1), MercuryMessages.h (+2 -1)

axlecrusher 2006-10-07 17:50 #66

revert, thanks for reading

3 lines of code changed in:

src: MercuryObject.cpp (+3 -2)

cnlohr 2006-10-07 00:42 #65

Cleanup, Fix Deque, and use Deque more places ... then also speed deque up a little, and stop using (dequeiterator++ in favor of ++de in a place)

15 lines of code changed in:

src: MercuryDisplay.h (+1 -1), MercuryMatrix.cpp (+3 -3), MercuryOGL.cpp (+2 -2), MercuryObject.cpp (+2 -3), MercuryObject.h (-1), MercuryObjectCommands.cpp (+3 -3), MercuryObjectCommands.h (+2 -2), MercuryVector.h (+2 -21)

cnlohr 2006-10-06 23:51 #64

UPDATE: Use MDeque

70 lines of code changed in:

src: Mercury.cpp (+21), MercuryObject.cpp (+3 -3), MercuryObject.h (+3 -3), MercuryVector.h (+43 -3)

axlecrusher 2006-10-06 22:17 #63

use SSE not SSE2

20 lines of code changed in:

src: MercuryMathASM.asm (+20 -21)

cnlohr 2006-10-06 19:58 #62

Fix warning

1 lines of code changed in:

src: ODEProjectile.cpp (+1 -1)

axlecrusher 2006-10-06 19:23 #61

Matrix multiplication in SSE

160 lines of code changed in:

src: MercuryMath.cpp (+39), MercuryMath.h (+2 -2), MercuryMathASM.asm (+101), MercuryMatrix.cpp (+12 -33), MercuryMatrix.h (+6 -5)

cnlohr 2006-10-06 16:04 #60

Fix Linux Compile

5 lines of code changed in:

src: Makefile.am (+2 -1), MercuryMath.h (+1 -1), ScreenFPS.cpp (+2 -2)

cnlohr 2006-10-06 15:48 #59

Fix Linux warnings

3 lines of code changed in:

src: MercuryVector.h (+3 -3)

cnlohr 2006-10-06 01:32 #58

Update for game

60 lines of code changed in:

Themes/default: metrics.ini (+3 -3)
Themes/default/Files: myworld2.ini (+37 -5)
src: Mercury-VC2003.vcproj (+9), ScreenFPS.cpp (+11 -11)

cnlohr 2006-10-06 01:04 #57

update world for game

44 lines of code changed in:

Themes/default/Files: myworld2.ini (+44 -44)

cnlohr 2006-10-06 00:59 #56

update

31 lines of code changed in:

src: ScreenFPS.cpp (+31 -14)

cnlohr 2006-10-06 00:33 #55

Update! for game

108 lines of code changed in:

Themes/default: metrics.ini (+2 -1)
Themes/default/Graphics: MoltenMetal.bmp (new)
src: ExplodingCokeCan.cpp (+1), ODEProjectile.cpp (+2 -2), ScreenFPS.cpp (+97 -19), ScreenFPS.h (+6)

cnlohr 2006-10-05 23:48 #54

util: function for synchronizing animation states.

1 lines of code changed in:

src: MercuryLoadableModel.h (+1)

cnlohr 2006-10-05 23:27 #53

Projectiles now have tracers

54 lines of code changed in:

src: ODEProjectile.cpp (+18 -2), ODEProjectile.h (+2), ScreenFPS.cpp (+30 -15), ScreenFPS.h (+4 -1)

cnlohr 2006-10-05 21:57 #52

Fix ray

4 lines of code changed in:

src: ODEProjectile.cpp (+4 -6)

cnlohr 2006-10-05 21:04 #51

Fix debug mode in VC6

1 lines of code changed in:

src: Mercury.dsp (+1 -1)

cnlohr 2006-10-05 20:01 #50

OOPS! Wrong way for multiplication

2 lines of code changed in:

src: MercuryLoadableModel.cpp (+2 -2)

cnlohr 2006-10-05 19:32 #49

Add MDeque

104 lines of code changed in:

src: MercuryMatrixStack.h (+8 -8), MercuryVector.h (+96 -1)

axlecrusher 2006-10-05 17:33 #48

Convert to C style (easier for ASM)

36 lines of code changed in:

src: MercuryMatrix.cpp (+33 -33), MercuryMatrix.h (+3 -3)

axlecrusher 2006-10-05 16:32 #47

inline

2 lines of code changed in:

src: MercuryMatrixStack.h (+2 -2)

axlecrusher 2006-10-05 16:31 #46

unneeded variable

0 lines of code changed in:

src: MercuryMatrix.cpp (-1)

axlecrusher 2006-10-05 14:27 #45

More direct work on matrix

44 lines of code changed in:

src: MercuryMatrix.cpp (+44 -44)

axlecrusher 2006-10-05 13:27 #44

operate directly on the data, bypass [] [] mercury matrix operators

27 lines of code changed in:

src: MercuryMatrix.cpp (+27 -25)

axlecrusher 2006-10-05 12:05 #43

Only send projection data when we apply the projection settings (which is only done when we have to

20 lines of code changed in:

src: MercuryDisplay.cpp (+3 -2), MercuryDisplay.h (+3 -1), MercuryDisplaySoftwareC.h (+1), MercuryDisplay_D3D.h (+1), MercuryOGL.cpp (+11 -9), MercuryOGL.h (+1)

cnlohr 2006-10-05 03:31 #42

Update to game... now it actually works... EXPLODING coke cans and all!

50 lines of code changed in:

src: ExplodingCokeCan.cpp (+47), ExplodingCokeCan.h (+2), ScreenFPS.cpp (+1 -1)

cnlohr 2006-10-05 03:31 #41

Add public function to get an object's parent

1 lines of code changed in:

src: MercuryObjectBase.h (+1)

cnlohr 2006-10-05 03:31 #40

virtualize add and removal functions

2 lines of code changed in:

src: MercuryObject.h (+2 -2)

cnlohr 2006-10-05 03:30 #39

Many updates regarding general usability and features.

55 lines of code changed in:

src: MercuryODE.cpp (+47 -16), MercuryODE.h (+8 -1)

cnlohr 2006-10-05 03:24 #38

update metrics for project

6 lines of code changed in:

Themes/default: metrics.ini (+6 -3)

cnlohr 2006-10-05 02:40 #37

updated metrics

7 lines of code changed in:

Themes/default: metrics.ini (+7)

cnlohr 2006-10-05 00:48 #36

Fix compile

2 lines of code changed in:

src: MercuryLoadableModel.cpp (+2 -2)

cnlohr 2006-10-04 23:04 #35

Update World

34 lines of code changed in:

Themes/default/Files: myworld2.ini (+34 -3)

cnlohr 2006-10-04 23:03 #34

Update, speed some stuff up

30 lines of code changed in:

src: MercuryOGL.cpp (+20 -11), ODEProjectile.cpp (+8 -12), ScreenFPS.cpp (+2 -1)

cnlohr 2006-10-04 23:02 #33

Matrix: Only pass in float *'s, this prevents calls to []

6 lines of code changed in:

src: MercuryMatrix.cpp (+1 -1), MercuryMatrix.h (+5 -3)

cnlohr 2006-10-04 21:13 #32

OOPS! You need these for the new screen

222 lines of code changed in:

src: ExplodingCokeCan.cpp (new 56), ODEProjectile.cpp (new 112), ODEProjectile.h (new 54)

cnlohr 2006-10-04 16:59 #31

The new ODE FPS screen! Totally doesn't work yet!

147 lines of code changed in:

src: ExplodingCokeCan.h (+5 -5), Mercury.dsp (+24), MercuryODE.cpp (+3 -6), ScreenFPS.cpp (+107 -9), ScreenFPS.h (+8 -1)

cnlohr 2006-10-04 16:58 #30

F3 does Z now

2 lines of code changed in:

src: ScreenMapEditor.cpp (+2 -1)

axlecrusher 2006-10-04 16:16 #29

move building

4 lines of code changed in:

Themes/default/Files: myworld.ini (+4 -4)

axlecrusher 2006-10-04 16:07 #28

update terrain

4 lines of code changed in:

Themes/default/Models: terrain.hgmdl (changed), terrain.hgmdl.Material01.ini (+4 -3)

axlecrusher 2006-10-04 14:56 #27

More blending modes

9 lines of code changed in:

src: MercuryOGL.cpp (+6), MercuryTexture.h (+3 -1)

axlecrusher 2006-10-04 13:39 #26

Resize the vector after we clear it.

1 lines of code changed in:

src: ScreenMapEditor.cpp (+1 -2)

axlecrusher 2006-10-04 13:24 #25

If we are changing to a projection that is the same as the previous, don't do anything

23 lines of code changed in:

src: MercuryDisplay.cpp (+20 -6), MercuryDisplay.h (+1 -1), MercuryObject.cpp (+1 -2), MercuryParticle.cpp (+1 -2)

cnlohr 2006-10-04 00:38 #24

New Project Commit... Can't wait to actually get it done!

613 lines of code changed in:

Themes/default: metrics.ini (+8 -1)
Themes/default/Files: Copper.ini (+17 -5), myworld2.ini (new 382)
src: ExplodingCokeCan.h (new 49), Mercury-VC2003.vcproj (+13), ScreenFPS.cpp (new 89), ScreenFPS.h (new 55)

cnlohr 2006-10-04 00:23 #23

Fix the map editor

22 lines of code changed in:

src: ScreenMapEditor.cpp (+20 -9), ScreenMapEditor.h (+2)

cnlohr 2006-10-04 00:23 #22

Use no image when failed to find image

1 lines of code changed in:

src: MercuryTheme.cpp (+1 -1)

cnlohr 2006-10-04 00:22 #21

Warn users on windows about asserts.

3 lines of code changed in:

src: MercuryUtil.cpp (+3)

axlecrusher 2006-10-03 21:39 #20

metric out

2 lines of code changed in:

Themes/default: metrics.ini (+1)
src: ScreenTitle.cpp (+1 -2)

axlecrusher 2006-10-03 21:26 #19

Don't change top of stack, just use it

2 lines of code changed in:

src: MercuryOGL.cpp (+2 -2)

axlecrusher 2006-10-03 21:16 #18

wrapUV

1 lines of code changed in:

Themes/default/Models: logo.hgmdl.initialShadingGroup.ini (+1 -1)

axlecrusher 2006-10-03 21:12 #17

Call MercuryObject::Update() last

5 lines of code changed in:

src: MercuryModel.cpp (+2 -2), MercuryObject.h (+1 -1), MercuryParticle.cpp (+1 -1), MercurySprite.cpp (+1 -1)

axlecrusher 2006-10-03 20:09 #16

demo tweenable textures

2 lines of code changed in:

src: ScreenTitle.cpp (+2 -9)

axlecrusher 2006-10-03 20:08 #15

Call material's update

16 lines of code changed in:

src: MercuryMaterial.h (+2), MercuryParticle.cpp (+6), MercuryParticle.h (+1), MercurySprite.cpp (+6 -3), MercurySprite.h (+1)

axlecrusher 2006-10-03 19:46 #14

Manually update materials since materials are not objects so they can not be automatically added using AddObject

10 lines of code changed in:

src: MercuryModel.cpp (+8 -1), MercuryModel.h (+2)

axlecrusher 2006-10-03 19:44 #13

Update function that updates textures

8 lines of code changed in:

src: MercuryMaterial.cpp (+6), MercuryMaterial.h (+2)

axlecrusher 2006-10-03 19:36 #12

automatically set texture matrix stack for each texture

10 lines of code changed in:

src: MercuryOGL.cpp (+10 -3)

axlecrusher 2006-10-03 16:35 #11

replace

3 lines of code changed in:

src: MercuryOGL.cpp (+3)

axlecrusher 2006-10-03 16:30 #10

fix headers

5 lines of code changed in:

src: MercuryDisplay.h (+1), MercuryMaterial.h (+2 -1), MercuryShapes.cpp (+1), MercurySprite.h (+1)

axlecrusher 2006-10-03 16:28 #9

Blending modes

13 lines of code changed in:

src: MercuryOGL.cpp (+13 -2)

axlecrusher 2006-10-03 16:28 #8

make tweenable via mercury object

23 lines of code changed in:

src: MercuryTexture.cpp (+2), MercuryTexture.h (+21 -2)

axlecrusher 2006-10-03 15:12 #7

Texture stack

10 lines of code changed in:

src: MercuryDisplay.cpp (+1), MercuryDisplay.h (+1), MercuryOGL.cpp (+6), MercuryObject.cpp (+2)

axlecrusher 2006-10-03 14:49 #6

project update

11 lines of code changed in:

src: Mercury-VC2005.vcproj (+11 -4)

axlecrusher 2006-10-03 14:47 #5

small updates

8 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (-2), MercuryMesh.cpp (+7 -5), MercuryOGL.cpp (-5), MercuryParticle.cpp (+1)

axlecrusher 2006-10-03 14:44 #4

some optional stuff

3 lines of code changed in:

src: Win32Window.cpp (+3)

axlecrusher 2006-10-02 13:49 #3

Add 2k5

4974 lines of code changed in:

src: Mercury-VC2005.sln (new 26), Mercury-VC2005.vcproj (new 4948)

cnlohr 2006-10-02 13:48 #2

Fix ending crash on 2k5

6 lines of code changed in:

src: MercuryScreenManager.cpp (+6 -2)

cnlohr 2006-10-02 13:39 #1

Fix constant crash on VC.net 2k5

3 lines of code changed in:

src: MercuryMessages.cpp (+3 -7)

September 2006 »

Generated by StatCVS 0.3