]> git.jsancho.org Git - lugaru.git/log
lugaru.git
13 years agomajor refactor of menu system, part 1
sf17k [Thu, 26 May 2011 20:20:17 +0000 (16:20 -0400)]
major refactor of menu system, part 1

13 years agomerge
Côme BERNIGAUD [Fri, 20 May 2011 08:07:56 +0000 (10:07 +0200)]
merge

13 years agosupressed a done TODO
Côme BERNIGAUD [Fri, 20 May 2011 08:01:11 +0000 (10:01 +0200)]
supressed a done TODO

13 years agoFixup shipped config
Alexander Monakov [Thu, 19 May 2011 07:32:38 +0000 (11:32 +0400)]
Fixup shipped config

13 years agofixed menu clicks carrying over
sf17k [Thu, 19 May 2011 07:30:04 +0000 (11:30 +0400)]
fixed menu clicks carrying over

13 years agoMerge with p/lugaru
Alexander Monakov [Thu, 19 May 2011 07:11:43 +0000 (11:11 +0400)]
Merge with p/lugaru

13 years agoSome refactor about Person class.
Côme BERNIGAUD [Wed, 18 May 2011 20:56:21 +0000 (22:56 +0200)]
Some refactor about Person class.

13 years agoAdded tag stableRC1 for changeset c3d5e4ac8224
Côme BERNIGAUD [Wed, 18 May 2011 20:55:29 +0000 (22:55 +0200)]
Added tag stableRC1 for changeset c3d5e4ac8224

13 years agobugfix about the console
Côme BERNIGAUD [Wed, 18 May 2011 20:08:49 +0000 (22:08 +0200)]
bugfix about the console

13 years agofixed some unwanted debug output
Côme BERNIGAUD [Wed, 18 May 2011 18:30:03 +0000 (20:30 +0200)]
fixed some unwanted debug output

13 years agoconsole commands works again.
Côme BERNIGAUD [Wed, 18 May 2011 17:44:33 +0000 (19:44 +0200)]
console commands works again.

13 years agoThe console key is now easy to configure. (the option will only be shown in debug...
Côme BERNIGAUD [Wed, 18 May 2011 15:20:42 +0000 (17:20 +0200)]
The console key is now easy to configure. (the option will only be shown in debug mode)

13 years agoadding missing source files
Côme BERNIGAUD [Wed, 18 May 2011 13:44:44 +0000 (15:44 +0200)]
adding missing source files

13 years agoadded a missing texture (the world image for temple campaign)
Côme BERNIGAUD [Wed, 18 May 2011 13:43:58 +0000 (15:43 +0200)]
added a missing texture (the world image for temple campaign)

13 years agoRefactor of the texture system
Côme BERNIGAUD [Tue, 17 May 2011 08:58:51 +0000 (10:58 +0200)]
Refactor of the texture system

13 years agorenaming some maps to be coherent.
Côme BERNIGAUD [Mon, 16 May 2011 15:42:40 +0000 (17:42 +0200)]
renaming some maps to be coherent.

13 years agobugfix about weapons
Côme BERNIGAUD [Mon, 16 May 2011 01:49:03 +0000 (03:49 +0200)]
bugfix about weapons

13 years agobug fix about pause menu
Côme BERNIGAUD [Sun, 15 May 2011 17:03:08 +0000 (19:03 +0200)]
bug fix about pause menu

13 years agoAdded a instruction file for compilation.
Côme BERNIGAUD [Sun, 15 May 2011 11:43:59 +0000 (13:43 +0200)]
Added a instruction file for compilation.

13 years agoA lot of clean up in MenuDraw.
Côme BERNIGAUD [Sat, 14 May 2011 23:43:54 +0000 (01:43 +0200)]
A lot of clean up in MenuDraw.

13 years agocleanup of campaign levels handling.
Côme BERNIGAUD [Sat, 14 May 2011 14:01:18 +0000 (16:01 +0200)]
cleanup of campaign levels handling.

13 years agolittle cleanup about campaign level handling
Côme BERNIGAUD [Sat, 14 May 2011 04:08:23 +0000 (06:08 +0200)]
little cleanup about campaign level handling

13 years agobugfix (world texture was messed when fullscreen/windowed switch) and cleanups
Côme BERNIGAUD [Fri, 13 May 2011 16:58:19 +0000 (18:58 +0200)]
bugfix (world texture was messed when fullscreen/windowed switch) and cleanups

13 years agoSome cleans, fullscreen is back if "--windowed" isn't passed as option.
Côme BERNIGAUD [Fri, 13 May 2011 16:33:39 +0000 (18:33 +0200)]
Some cleans, fullscreen is back if "--windowed" isn't passed as option.

13 years agosome small cleanups
Côme BERNIGAUD [Fri, 13 May 2011 15:47:18 +0000 (17:47 +0200)]
some small cleanups

13 years agobug fix from weapon clean up
Côme BERNIGAUD [Fri, 13 May 2011 15:32:19 +0000 (17:32 +0200)]
bug fix from weapon clean up

13 years agoWeapon clean up.
Côme BERNIGAUD [Fri, 13 May 2011 15:00:35 +0000 (17:00 +0200)]
Weapon clean up.

13 years agobug fix in the campaign screen (lines on the map were not correctly shown)
Côme BERNIGAUD [Fri, 13 May 2011 10:55:26 +0000 (12:55 +0200)]
bug fix in the campaign screen (lines on the map were not correctly shown)

13 years agomerge
Côme BERNIGAUD [Thu, 12 May 2011 17:44:21 +0000 (19:44 +0200)]
merge

13 years agoremoving a debug cout
Côme BERNIGAUD [Thu, 12 May 2011 17:43:57 +0000 (19:43 +0200)]
removing a debug cout

13 years agoSome bug fixes. Now the game remember which campaign you were playing last time.
Côme BERNIGAUD [Thu, 12 May 2011 16:22:06 +0000 (18:22 +0200)]
Some bug fixes. Now the game remember which campaign you were playing last time.

13 years agoupdated xcode project
sf17k [Thu, 12 May 2011 09:46:55 +0000 (05:46 -0400)]
updated xcode project

13 years agoI had added the wrong maps, not it works better
Côme BERNIGAUD [Thu, 12 May 2011 07:35:57 +0000 (09:35 +0200)]
I had added the wrong maps, not it works better

13 years agoAdding the temple campaign so we can test multiple campaigns features.
Côme BERNIGAUD [Wed, 11 May 2011 23:33:44 +0000 (01:33 +0200)]
Adding the temple campaign so we can test multiple campaigns features.

13 years agoThe game now supports multiple campaigns!
Côme BERNIGAUD [Wed, 11 May 2011 19:25:08 +0000 (21:25 +0200)]
The game now supports multiple campaigns!

13 years agoNo more black background for the map, some little cleanup
Côme BERNIGAUD [Wed, 11 May 2011 17:21:56 +0000 (19:21 +0200)]
No more black background for the map, some little cleanup

13 years agoProblem fixed (LoadCampaign added when going back to campaign menu)
Côme BERNIGAUD [Wed, 11 May 2011 16:49:18 +0000 (18:49 +0200)]
Problem fixed (LoadCampaign added when going back to campaign menu)

13 years agoalmost nothing
Côme BERNIGAUD [Wed, 11 May 2011 16:25:47 +0000 (18:25 +0200)]
almost nothing

13 years agoclean ups, and now campaignProgess is well initialized in accounts
Côme BERNIGAUD [Wed, 11 May 2011 11:55:41 +0000 (13:55 +0200)]
clean ups, and now campaignProgess is well initialized in accounts

13 years agocampaign bug fixes
sf17k [Wed, 11 May 2011 08:05:00 +0000 (04:05 -0400)]
campaign bug fixes

13 years agofirst modifications in order to support multiple campaign.
Côme BERNIGAUD [Tue, 10 May 2011 22:31:04 +0000 (00:31 +0200)]
first modifications in order to support multiple campaign.

13 years agosome more unused variables cleanup
Côme BERNIGAUD [Tue, 10 May 2011 21:27:04 +0000 (23:27 +0200)]
some more unused variables cleanup

13 years agomerge
sf17k [Tue, 10 May 2011 20:19:25 +0000 (16:19 -0400)]
merge

13 years agoremoved unused menu animation code
sf17k [Tue, 10 May 2011 20:18:27 +0000 (16:18 -0400)]
removed unused menu animation code

13 years agono more 5000 int array, a nice vector instead.
Côme BERNIGAUD [Tue, 10 May 2011 20:08:00 +0000 (22:08 +0200)]
no more 5000 int array, a nice vector instead.

13 years agosome more cleans thanks to cppcheck
Côme BERNIGAUD [Tue, 10 May 2011 19:41:02 +0000 (21:41 +0200)]
some more cleans thanks to cppcheck

13 years agoSome cleans, some duplicated code corrected.
Côme BERNIGAUD [Tue, 10 May 2011 18:51:07 +0000 (20:51 +0200)]
Some cleans, some duplicated code corrected.

13 years agosome cleanup
Côme BERNIGAUD [Tue, 10 May 2011 17:37:16 +0000 (19:37 +0200)]
some cleanup

13 years agoSome reorganization of MenuTick.
Côme BERNIGAUD [Tue, 10 May 2011 16:08:24 +0000 (18:08 +0200)]
Some reorganization of MenuTick.

13 years agoSome clean up in the menu system and the drawing menu function.
Côme BERNIGAUD [Tue, 10 May 2011 15:19:53 +0000 (17:19 +0200)]
Some clean up in the menu system and the drawing menu function.

13 years agorename music1, music2, music3
sf17k [Tue, 10 May 2011 05:07:38 +0000 (01:07 -0400)]
rename music1, music2, music3

13 years agomenu cleanup
sf17k [Tue, 10 May 2011 04:43:35 +0000 (00:43 -0400)]
menu cleanup

13 years agoObtain float max value from std::numeric_limits
Alexander Monakov [Thu, 5 May 2011 04:03:41 +0000 (08:03 +0400)]
Obtain float max value from std::numeric_limits

13 years agoDo not define INLINE in custom config for libjpeg
Alexander Monakov [Thu, 5 May 2011 03:59:27 +0000 (07:59 +0400)]
Do not define INLINE in custom config for libjpeg

13 years agoGuard SDL_GL_SWAP_CONTROL by version check
Alexander Monakov [Wed, 4 May 2011 19:30:55 +0000 (23:30 +0400)]
Guard SDL_GL_SWAP_CONTROL by version check

13 years agoSet swap interval via SDL, enable by default
Alexander Monakov [Mon, 2 May 2011 15:40:52 +0000 (19:40 +0400)]
Set swap interval via SDL, enable by default

13 years agoDo not link against OpenGL library
Alexander Monakov [Mon, 2 May 2011 08:31:29 +0000 (12:31 +0400)]
Do not link against OpenGL library

13 years agoAdd missing prototypes
Alexander Monakov [Mon, 2 May 2011 08:26:20 +0000 (12:26 +0400)]
Add missing prototypes

13 years agoBug fixed (we couldn't access to account menu)
Côme BERNIGAUD [Tue, 22 Feb 2011 15:40:10 +0000 (16:40 +0100)]
Bug fixed (we couldn't access to account menu)

13 years agonoaccount crash corrected
Côme BERNIGAUD [Mon, 14 Feb 2011 14:40:20 +0000 (15:40 +0100)]
noaccount crash corrected

13 years agoLittle fix in Account.cpp
Côme BERNIGAUD [Mon, 14 Feb 2011 14:38:33 +0000 (15:38 +0100)]
Little fix in Account.cpp

13 years agoJeff & David of Wolfire agreed to relicense portions of the game assets under CC...
Côme BERNIGAUD [Mon, 14 Feb 2011 14:37:43 +0000 (15:37 +0100)]
Jeff & David of Wolfire agreed to relicense portions of the game assets under CC-BY-SA 3.0

13 years agooptimizing LoadLevel(int which)
Côme BERNIGAUD [Mon, 14 Feb 2011 14:36:00 +0000 (15:36 +0100)]
optimizing LoadLevel(int which)

13 years agomerge
sf17k [Mon, 9 May 2011 07:44:27 +0000 (03:44 -0400)]
merge

13 years agofixed menu clicks carrying over
sf17k [Sat, 7 May 2011 06:28:27 +0000 (02:28 -0400)]
fixed menu clicks carrying over

13 years agoimproved text input handling
sf17k [Sat, 7 May 2011 05:35:31 +0000 (01:35 -0400)]
improved text input handling

13 years agofix a couple bugs introduced in cleanup
sf17k [Sat, 7 May 2011 04:57:49 +0000 (00:57 -0400)]
fix a couple bugs introduced in cleanup

13 years agotoggle fullscreen with alt+enter
sf17k [Sat, 7 May 2011 00:02:20 +0000 (20:02 -0400)]
toggle fullscreen with alt+enter

13 years agobeginnings of windowed mode support
sf17k [Fri, 6 May 2011 03:39:40 +0000 (23:39 -0400)]
beginnings of windowed mode support

13 years agocleanup
sf17k [Fri, 6 May 2011 01:20:11 +0000 (21:20 -0400)]
cleanup

13 years agoadd config files to .hgignore
sf17k [Wed, 4 May 2011 22:36:18 +0000 (18:36 -0400)]
add config files to .hgignore

13 years agoMAJOR cleanup
sf17k [Wed, 4 May 2011 22:09:15 +0000 (18:09 -0400)]
MAJOR cleanup

13 years agoupdate, remove config files
sf17k [Wed, 4 May 2011 20:41:37 +0000 (16:41 -0400)]
update, remove config files

13 years agoUsers file saved in write directory
David Rosen [Sat, 5 Feb 2011 00:19:18 +0000 (19:19 -0500)]
Users file saved in write directory

13 years agoRemove terraindetail (== 1 anyway)
Alexander Monakov [Fri, 7 Jan 2011 20:05:20 +0000 (23:05 +0300)]
Remove terraindetail (== 1 anyway)

13 years agoMap loading cleanup
Alexander Monakov [Fri, 7 Jan 2011 19:52:22 +0000 (22:52 +0300)]
Map loading cleanup

13 years agoMinor Loadlevel cleanup
Alexander Monakov [Fri, 7 Jan 2011 19:41:38 +0000 (22:41 +0300)]
Minor Loadlevel cleanup

13 years agoSquash one remaining registration tidbit
Alexander Monakov [Fri, 7 Jan 2011 18:15:45 +0000 (21:15 +0300)]
Squash one remaining registration tidbit

13 years agoMinor SkyBox cleanup
Alexander Monakov [Fri, 7 Jan 2011 18:06:29 +0000 (21:06 +0300)]
Minor SkyBox cleanup

13 years agoRemove Constants.h
Alexander Monakov [Mon, 3 Jan 2011 21:23:33 +0000 (00:23 +0300)]
Remove Constants.h

13 years agoMove map/waypoint/pose types to Game.h
Alexander Monakov [Mon, 3 Jan 2011 21:22:49 +0000 (00:22 +0300)]
Move map/waypoint/pose types  to Game.h

13 years agoMove dialogue stuff to Game.{cpp,h}
Alexander Monakov [Mon, 3 Jan 2011 21:20:15 +0000 (00:20 +0300)]
Move dialogue stuff to Game.{cpp,h}

13 years agoSimplify dialogue handling
Alexander Monakov [Mon, 3 Jan 2011 21:13:16 +0000 (00:13 +0300)]
Simplify dialogue handling

13 years agoMigrate some more definitions from Constants.h
Alexander Monakov [Mon, 3 Jan 2011 20:38:51 +0000 (23:38 +0300)]
Migrate some more definitions from Constants.h

13 years agoRemove unused definitions from Constants.h
Alexander Monakov [Mon, 3 Jan 2011 20:13:35 +0000 (23:13 +0300)]
Remove unused definitions from Constants.h

13 years agoMigrate some more definitions from Constants.h
Alexander Monakov [Mon, 3 Jan 2011 20:06:23 +0000 (23:06 +0300)]
Migrate some more definitions from Constants.h

13 years agoMigrate some more definitions from Constants.h
Alexander Monakov [Mon, 3 Jan 2011 20:01:29 +0000 (23:01 +0300)]
Migrate some more definitions from Constants.h

13 years agoMigrate some definitions from Constants.h
Alexander Monakov [Mon, 3 Jan 2011 19:54:45 +0000 (22:54 +0300)]
Migrate some definitions from Constants.h

13 years agoRemove some extra declarations of "channels"
Alexander Monakov [Mon, 3 Jan 2011 19:41:13 +0000 (22:41 +0300)]
Remove some extra declarations of "channels"

13 years agoIntroduce pause_sound
Alexander Monakov [Mon, 3 Jan 2011 19:07:42 +0000 (22:07 +0300)]
Introduce pause_sound

13 years agoIntroduce resume_stream
Alexander Monakov [Mon, 3 Jan 2011 18:58:52 +0000 (21:58 +0300)]
Introduce resume_stream

13 years agoRemove more commented-out code. Out of sight, out of mind
Alexander Monakov [Mon, 3 Jan 2011 18:30:40 +0000 (21:30 +0300)]
Remove more commented-out code.  Out of sight, out of mind

13 years agoMore PlayStreamEx eradication
Alexander Monakov [Mon, 3 Jan 2011 16:50:25 +0000 (19:50 +0300)]
More PlayStreamEx eradication

13 years agoMore PlaySoundEx eradication
Alexander Monakov [Mon, 3 Jan 2011 16:23:10 +0000 (19:23 +0300)]
More PlaySoundEx eradication

13 years agoRemove more comments that also confuse Vim
Alexander Monakov [Sat, 1 Jan 2011 22:12:01 +0000 (01:12 +0300)]
Remove more comments that also confuse Vim

13 years agoReindent Person::Reverse
Alexander Monakov [Sat, 1 Jan 2011 22:06:21 +0000 (01:06 +0300)]
Reindent Person::Reverse

13 years agoSimplify DoMipmaps
Alexander Monakov [Sat, 1 Jan 2011 21:43:13 +0000 (00:43 +0300)]
Simplify DoMipmaps
* * *
foldme

13 years agoA bit more readable CheckKick
Alexander Monakov [Sat, 1 Jan 2011 20:36:53 +0000 (23:36 +0300)]
A bit more readable CheckKick

13 years agoDrop last remains of PlaySoundEx from Person.cpp
Alexander Monakov [Sat, 1 Jan 2011 20:11:04 +0000 (23:11 +0300)]
Drop last remains of PlaySoundEx from Person.cpp

13 years agoDrop useless ATM zero-initialization
Alexander Monakov [Sat, 1 Jan 2011 19:52:07 +0000 (22:52 +0300)]
Drop useless ATM zero-initialization